@@ -4,10 +4,10 @@ description: Merges the latest Library.Template into this repo (at position of H
44
55# Instructions
66
7- 1 . Run ` tools\ MergeFrom-Template.ps1 `
7+ 1 . Run ` tools/ MergeFrom-Template.ps1 `
882 . Resolve merge conflicts, taking into account conflict resolution policy below.
993 . Validate the changes, as described in the validation section below.
10- 4 . Commiting your changes (if applicable).
10+ 4 . Committing your changes (if applicable).
1111
1212## Conflict resolution policy
1313
@@ -33,7 +33,7 @@ Conflicts in the following files should always be resolved by keeping the curren
3333Very typically, when the incoming change is to a file that was deleted locally, the correct resolution is to re-delete the file.
3434
3535In some cases however, the deleted file may have incoming changes that should be applied to other files.
36- The ` test\ Library.Tests\ Library.Tests.csproj ` file is very typical of this.
36+ The ` test/ Library.Tests/ Library.Tests.csproj ` file is very typical of this.
3737Changes to this file should very typically be applied to any and all test projects in the repo.
3838You are responsible for doing this in addition to re-deleting this template file.
3939
@@ -44,7 +44,7 @@ Use #runSubagent for each step.
4444
45451 . Verify that ` dotnet restore ` succeeds. Fix any issues that come up.
46462 . Verify that ` dotnet build ` succeeds.
47- 3 . Verify that tests succeed by running ` tools\ dotnet-test-cloud.ps1 ` .
47+ 3 . Verify that tests succeed by running ` tools/ dotnet-test-cloud.ps1 ` .
4848
4949While these validations are described using ` dotnet ` CLI commands, some repos require using full msbuild.exe.
5050You can detect this by checking the ` azure-pipelines/dotnet.yml ` or ` .github/workflows/build.yml ` files for use of one or the other tool.
0 commit comments