diff --git a/.github/workflows/do-not-merge-label-check.yml b/.github/workflows/do-not-merge-label-check.yml index 4dd656d43..897ea90cb 100644 --- a/.github/workflows/do-not-merge-label-check.yml +++ b/.github/workflows/do-not-merge-label-check.yml @@ -28,7 +28,7 @@ jobs: - name: 'Check "${{ matrix.label }}" label' run: | - echo "::notice::Merging permission is diabled for PRs when the '${{ matrix.label }}' label is applied." + echo "::notice::Merging permission is disabled for PRs when the '${{ matrix.label }}' label is applied." if [ "${{ contains(github.event.pull_request.labels.*.name, matrix.label) }}" = "true" ]; then echo "::error::Pull request is labeled as '${{ matrix.label }}'. Please remove the label before merging." diff --git a/.github/workflows/grammar-validator.yaml b/.github/workflows/grammar-validator.yaml index 3d79ee3b6..a77d65b3c 100644 --- a/.github/workflows/grammar-validator.yaml +++ b/.github/workflows/grammar-validator.yaml @@ -4,6 +4,11 @@ name: ANTLR Grammar validator on: pull_request: types: [opened, synchronize, reopened] + paths: + - "standard/**" + - "tools/GrammarTesting/**" + - "tools/validate-grammar.sh" + - ".github/workflows/dependencies/GrammarTestingEnv.tgz" workflow_dispatch: inputs: reason: diff --git a/.github/workflows/renumber-sections.yaml b/.github/workflows/renumber-sections.yaml index 7a69349d6..759533c6f 100644 --- a/.github/workflows/renumber-sections.yaml +++ b/.github/workflows/renumber-sections.yaml @@ -4,6 +4,10 @@ name: Renumber standard TOC on: pull_request: types: [opened, synchronize, reopened] + paths: + - "standard/**" + - "tools/StandardAnchorTags/**" + - "tools/run-section-renumber.sh" workflow_dispatch: inputs: reason: diff --git a/.github/workflows/test-examples.yaml b/.github/workflows/test-examples.yaml index e16492031..64ec90d3f 100644 --- a/.github/workflows/test-examples.yaml +++ b/.github/workflows/test-examples.yaml @@ -6,6 +6,11 @@ on: types: [opened, synchronize, reopened] paths: - "standard/*.md" + - "tools/example-templates/**" + - "tools/ExampleExtractor/**" + - "tools/ExampleTester/**" + - "tools/Utilities/**" + - "tools/test-examples.sh" workflow_dispatch: inputs: reason: diff --git a/.github/workflows/tools-tests.yaml b/.github/workflows/tools-tests.yaml index 9695e88b4..3bac9dfca 100644 --- a/.github/workflows/tools-tests.yaml +++ b/.github/workflows/tools-tests.yaml @@ -5,9 +5,9 @@ on: pull_request: types: [opened, synchronize, reopened] paths: - - '**.cs' - - '**.csproj' - - '**.sln' + - 'tools/**.cs' + - 'tools/**.csproj' + - 'tools/**.sln' workflow_dispatch: inputs: reason: diff --git a/.github/workflows/word-converter.yaml b/.github/workflows/word-converter.yaml index 4025cc76c..cdccba4a3 100644 --- a/.github/workflows/word-converter.yaml +++ b/.github/workflows/word-converter.yaml @@ -4,6 +4,10 @@ name: Word Converter on: pull_request: types: [opened, synchronize, reopened] + paths: + - "standard/**" + - "tools/MarkdownConverter/**" + - "tools/run-converter.sh" workflow_dispatch: inputs: reason: diff --git a/.gitignore b/.gitignore index 17843972a..a4e559bb3 100644 --- a/.gitignore +++ b/.gitignore @@ -360,6 +360,3 @@ test-grammar/ # don't checkin jar files: *.jar - -# don't checkin launchSettings: -**/launchSettings.json diff --git a/standard/conversions.md b/standard/conversions.md index a68a539d7..e646ac6b9 100644 --- a/standard/conversions.md +++ b/standard/conversions.md @@ -767,7 +767,7 @@ Specifically, an anonymous function `F` is compatible with a delegate type `D` > *Example*: The following examples illustrate these rules: > -> +> > ```csharp > delegate void D(int x); > D d1 = delegate { }; // Ok diff --git a/tools/ExampleExtractor/Properties/launchSettings.json b/tools/ExampleExtractor/Properties/launchSettings.json new file mode 100644 index 000000000..4d62874e6 --- /dev/null +++ b/tools/ExampleExtractor/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "ExampleExtractor": { + "commandName": "Project", + "commandLineArgs": "../standard example-templates tmp", + "workingDirectory": "$(SolutionDir)" + } + } +} diff --git a/tools/ExampleFormatter/Properties/launchSettings.json b/tools/ExampleFormatter/Properties/launchSettings.json new file mode 100644 index 000000000..a1f290d5d --- /dev/null +++ b/tools/ExampleFormatter/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "ExampleFormatter": { + "commandName": "Project", + "commandLineArgs": "../standard", + "workingDirectory": "$(SolutionDir)" + } + } +} diff --git a/tools/ExampleTester/ExampleTester.csproj b/tools/ExampleTester/ExampleTester.csproj index 46f73c0cd..8642c9cad 100644 --- a/tools/ExampleTester/ExampleTester.csproj +++ b/tools/ExampleTester/ExampleTester.csproj @@ -8,7 +8,6 @@ - diff --git a/tools/ExampleTester/GeneratedExample.cs b/tools/ExampleTester/GeneratedExample.cs index 6c06eab33..aeea299d9 100644 --- a/tools/ExampleTester/GeneratedExample.cs +++ b/tools/ExampleTester/GeneratedExample.cs @@ -1,5 +1,4 @@ using ExampleExtractor; -using Microsoft.Build.Locator; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.MSBuild; using Newtonsoft.Json; @@ -11,11 +10,6 @@ namespace ExampleTester; internal class GeneratedExample { - static GeneratedExample() - { - MSBuildLocator.RegisterDefaults(); - } - private readonly string directory; internal ExampleMetadata Metadata { get; } diff --git a/tools/ExampleTester/Properties/launchSettings.json b/tools/ExampleTester/Properties/launchSettings.json new file mode 100644 index 000000000..73e4c98f4 --- /dev/null +++ b/tools/ExampleTester/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "ExampleTester": { + "commandName": "Project", + "commandLineArgs": "tmp", + "workingDirectory": "$(SolutionDir)" + } + } +} \ No newline at end of file diff --git a/tools/MarkdownConverter/Properties/launchSettings.json b/tools/MarkdownConverter/Properties/launchSettings.json new file mode 100644 index 000000000..3a82c70d8 --- /dev/null +++ b/tools/MarkdownConverter/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "MarkdownConverter": { + "commandName": "Project", + "commandLineArgs": "../standard/*.md MarkdownConverter/template.docx -o tmp/standard.docx", + "workingDirectory": "$(SolutionDir)" + } + } +} \ No newline at end of file diff --git a/tools/StandardAnchorTags/Properties/launchSettings.json b/tools/StandardAnchorTags/Properties/launchSettings.json new file mode 100644 index 000000000..dcee60616 --- /dev/null +++ b/tools/StandardAnchorTags/Properties/launchSettings.json @@ -0,0 +1,9 @@ +{ + "profiles": { + "StandardAnchorTags": { + "commandName": "Project", + "commandLineArgs": "--owner dotnet --repo csharpstandard", + "workingDirectory": "$(SolutionDir)" + } + } +} \ No newline at end of file diff --git a/tools/StandardAnchorTags/StandardAnchorTags.csproj b/tools/StandardAnchorTags/StandardAnchorTags.csproj index 8157f79fc..2e89bb498 100644 --- a/tools/StandardAnchorTags/StandardAnchorTags.csproj +++ b/tools/StandardAnchorTags/StandardAnchorTags.csproj @@ -1,4 +1,4 @@ - + Exe @@ -7,10 +7,6 @@ enable - - - -