Skip to content

Commit

Permalink
Merge pull request #33571 from dotnet/merges/master-to-features/reado…
Browse files Browse the repository at this point in the history
…nly-members

Merge master to features/readonly-members
  • Loading branch information
dotnet-automerge-bot authored Feb 21, 2019
2 parents a330cdc + 69071c6 commit 2da762e
Show file tree
Hide file tree
Showing 57 changed files with 1,020 additions and 486 deletions.
16 changes: 9 additions & 7 deletions src/CodeStyle/CSharp/Tests/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
16 changes: 9 additions & 7 deletions src/CodeStyle/Core/Tests/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
16 changes: 9 additions & 7 deletions src/CodeStyle/VisualBasic/Tests/My Project/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
16 changes: 9 additions & 7 deletions src/Compilers/CSharp/Test/Emit/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
16 changes: 9 additions & 7 deletions src/Compilers/CSharp/Test/Symbol/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
16 changes: 9 additions & 7 deletions src/Compilers/CSharp/Test/Syntax/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
16 changes: 9 additions & 7 deletions src/Compilers/CSharp/Test/WinRT/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"profiles": {
"xUnit.net Console": {
"executablePath": "$(XUnitPath)",
"commandLineArgs": "$(XUnitArguments)"
"xUnit.net Console (32-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.x86.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
},
"xUnit.net WPF Runner": {
"executablePath": "$(XUnitWpfPath)",
"commandLineArgs": "$(XUnitWpfArguments)"
"xUnit.net Console (64-bit)": {
"commandName": "Executable",
"executablePath": "$(NuGetPackageRoot)xunit.runner.console\\$(XUnitVersion)\\tools\\net452\\xunit.console.exe",
"commandLineArgs": "$(TargetPath) -noshadow -verbose"
}
}
}
}
Loading

0 comments on commit 2da762e

Please sign in to comment.