Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/do-not-merge-label-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/grammar-validator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/renumber-sections.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tools-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/word-converter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,3 @@ test-grammar/

# don't checkin jar files:
*.jar

# don't checkin launchSettings:
**/launchSettings.json
2 changes: 1 addition & 1 deletion standard/conversions.md
Original file line number Diff line number Diff line change
Expand Up @@ -767,7 +767,7 @@ Specifically, an anonymous function `F` is compatible with a delegate type `D`

> *Example*: The following examples illustrate these rules:
>
> <!-- Example: {template:"code-in-class-lib-without-using", name:"AnonymousFunctionsConv1", expectedErrors:["CS1593","CS1661","CS1678","CS8030","CS1688","CS1661","CS1676","CS1643","CS0126","CS0029","CS1662","CS1670","CS0029","CS1662"]} -->
> <!-- Example: {template:"code-in-class-lib-without-using", name:"AnonymousFunctionsConv1", expectedErrors:["CS1593","CS1661","CS1678","CS8030","CS1688","CS1676","CS1643","CS0126","CS0029","CS1662","CS1670","CS0029","CS1662"]} -->
> ```csharp
> delegate void D(int x);
> D d1 = delegate { }; // Ok
Expand Down
9 changes: 9 additions & 0 deletions tools/ExampleExtractor/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"profiles": {
"ExampleExtractor": {
"commandName": "Project",
"commandLineArgs": "../standard example-templates tmp",
"workingDirectory": "$(SolutionDir)"
}
}
}
9 changes: 9 additions & 0 deletions tools/ExampleFormatter/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"profiles": {
"ExampleFormatter": {
"commandName": "Project",
"commandLineArgs": "../standard",
"workingDirectory": "$(SolutionDir)"
}
}
}
1 change: 0 additions & 1 deletion tools/ExampleTester/ExampleTester.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Build.Locator" Version="1.9.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
<PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
Expand Down
6 changes: 0 additions & 6 deletions tools/ExampleTester/GeneratedExample.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ExampleExtractor;
using Microsoft.Build.Locator;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.MSBuild;
using Newtonsoft.Json;
Expand All @@ -11,11 +10,6 @@ namespace ExampleTester;

internal class GeneratedExample
{
static GeneratedExample()
{
MSBuildLocator.RegisterDefaults();
}

private readonly string directory;
internal ExampleMetadata Metadata { get; }

Expand Down
9 changes: 9 additions & 0 deletions tools/ExampleTester/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"profiles": {
"ExampleTester": {
"commandName": "Project",
"commandLineArgs": "tmp",
"workingDirectory": "$(SolutionDir)"
}
}
}
9 changes: 9 additions & 0 deletions tools/MarkdownConverter/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"profiles": {
"MarkdownConverter": {
"commandName": "Project",
"commandLineArgs": "../standard/*.md MarkdownConverter/template.docx -o tmp/standard.docx",
"workingDirectory": "$(SolutionDir)"
}
}
}
9 changes: 9 additions & 0 deletions tools/StandardAnchorTags/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"profiles": {
"StandardAnchorTags": {
"commandName": "Project",
"commandLineArgs": "--owner dotnet --repo csharpstandard",
"workingDirectory": "$(SolutionDir)"
}
}
}
6 changes: 1 addition & 5 deletions tools/StandardAnchorTags/StandardAnchorTags.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
Expand All @@ -7,10 +7,6 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.22272.1" />
</ItemGroup>
Expand Down
Loading