From 806423bb6a75e5991e92f53bf1b27532580a42a1 Mon Sep 17 00:00:00 2001 From: nohwnd Date: Thu, 13 May 2021 14:10:33 +0200 Subject: [PATCH 1/2] Rename to main --- CONTRIBUTING.md | 6 +++--- README.md | 14 +++++++------- scripts/write-release-notes.ps1 | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0730c476c2..757d10b195 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -2,13 +2,13 @@ Welcome, and thank you for your interest in contributing. There are many ways to contribute: - [Submit issues](https://github.com/Microsoft/testfx/issues) and help verify fixes as they are checked in. - Review the [source code changes](https://github.com/Microsoft/testfx/pulls). -- [Contribute features and fixes](https://github.com/Microsoft/testfx-docs/blob/master/docs/contribute.md). +- [Contribute features and fixes](https://github.com/Microsoft/testfx-docs/blob/main/docs/contribute.md). - Contribute to the [documentation](https://github.com/Microsoft/testfx-docs). ### Building If you want to understand how **testfx** works or want to debug an issue, you'll want to get the source, build it, and run it locally. **testfx** can be built from within Visual Studio or from the CLI. -- [Building with Visual Studio](https://github.com/Microsoft/testfx-docs/blob/master/docs/contribute.md#building-with-visual-studiovs) -- [Building with CLI](https://github.com/Microsoft/testfx-docs/blob/master/docs/contribute.md#building-with-command-linecli) +- [Building with Visual Studio](https://github.com/Microsoft/testfx-docs/blob/main/docs/contribute.md#building-with-visual-studiovs) +- [Building with CLI](https://github.com/Microsoft/testfx-docs/blob/main/docs/contribute.md#building-with-command-linecli) ### Thank You! Your contributions to open source, large or small, make projects like this possible. Thank you for taking the time to contribute. diff --git a/README.md b/README.md index bc5fbc253d..5a15c23575 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This is a fully supported, open source and cross-platform implementation of the ### Build status -[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/testfx/microsoft.testfx.ci?branchName=master)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=937&branchName=master) +[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/testfx/microsoft.testfx.ci?branchName=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=937&branchName=main) ### Latest Builds | | Framework | Adapter | @@ -19,22 +19,22 @@ This is a fully supported, open source and cross-platform implementation of the There are many ways to contribute to testfx - [Submit issues](https://github.com/Microsoft/testfx/issues) and help verify fixes as they are checked in. - Review the [source code changes](https://github.com/Microsoft/testfx/pulls). -- [Contribute features and fixes](https://github.com/Microsoft/testfx-docs/blob/master/docs/contribute.md). +- [Contribute features and fixes](https://github.com/Microsoft/testfx-docs/blob/main/docs/contribute.md). - Contribute to the [documentation](https://github.com/Microsoft/testfx-docs). ### Building testfx can be built from within Visual Studio or from the CLI. -- [Building with Visual Studio](https://github.com/Microsoft/testfx-docs/blob/master/docs/contribute.md#building-with-visual-studiovs) -- [Building with CLI](https://github.com/Microsoft/testfx-docs/blob/master/docs/contribute.md#building-with-command-linecli) +- [Building with Visual Studio](https://github.com/Microsoft/testfx-docs/blob/main/docs/contribute.md#building-with-visual-studiovs) +- [Building with CLI](https://github.com/Microsoft/testfx-docs/blob/main/docs/contribute.md#building-with-command-linecli) ### Microsoft Open Source Code of Conduct This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. ### License -testfx platform is licensed under the [MIT license](https://github.com/Microsoft/testfx/blob/master/LICENSE) +testfx platform is licensed under the [MIT license](https://github.com/Microsoft/testfx/blob/main/LICENSE) ### Issue Tracking -Please see [issue tracking](https://github.com/Microsoft/testfx-docs/blob/master/issuetracking.md) for a description of the workflow we use to process issues. +Please see [issue tracking](https://github.com/Microsoft/testfx-docs/blob/main/issuetracking.md) for a description of the workflow we use to process issues. ### Roadmap -For information on shipped and upcoming features/enhancements please refer to our [Releases](https://github.com/Microsoft/testfx-docs/blob/master/docs/releases.md) and [Quarterly Checkin reports](https://github.com/Microsoft/testfx-docs/tree/master/Quarterly%20Checkins). +For information on shipped and upcoming features/enhancements please refer to our [Releases](https://github.com/Microsoft/testfx-docs/blob/main/docs/releases.md) and [Quarterly Checkin reports](https://github.com/Microsoft/testfx-docs/tree/main/Quarterly%20Checkins). diff --git a/scripts/write-release-notes.ps1 b/scripts/write-release-notes.ps1 index c4e9b06099..81c33004d6 100644 --- a/scripts/write-release-notes.ps1 +++ b/scripts/write-release-notes.ps1 @@ -99,7 +99,7 @@ $issues = $log | ForEach-Object { $output = @" -See release notes [here](https://github.com/microsoft/testfx-docs/blob/master/docs/releases.md#$(("$v $date" -replace "\.", "" -replace "\W", "-").ToLowerInvariant())). +See release notes [here](https://github.com/microsoft/testfx-docs/blob/main/docs/releases.md#$(("$v $date" -replace "\.", "" -replace "\W", "-").ToLowerInvariant())). --- From 442a5b5172d20b2703e279cd518896b857e75f8d Mon Sep 17 00:00:00 2001 From: nohwnd Date: Thu, 13 May 2021 14:12:16 +0200 Subject: [PATCH 2/2] main file --- .../netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs b/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs index cfdf441016..9cc8bba3cb 100644 --- a/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs +++ b/src/Adapter/PlatformServices.Shared/netstandard1.3/Utilities/ns13DeploymentUtilityBase.cs @@ -183,7 +183,7 @@ protected IEnumerable Deploy(IList deploymentItems, stri var filesToDeploy = new List(1); filesToDeploy.Add(deploymentItemFile); - // Find dependencies of test deployment items and deploy them at the same time as master file. + // Find dependencies of test deployment items and deploy them at the same time as the main file. if (deploymentItem.OriginType == DeploymentItemOriginType.PerTestDeployment && this.AssemblyUtility.IsAssemblyExtension(Path.GetExtension(deploymentItemFile))) {