Merge branch 'main' into microbuild
This commit is contained in:
Коммит
2636881060
|
@ -12,7 +12,7 @@ env:
|
||||||
TreatWarningsAsErrors: true
|
TreatWarningsAsErrors: true
|
||||||
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
|
||||||
BUILDCONFIGURATION: Release
|
BUILDCONFIGURATION: Release
|
||||||
codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/
|
# codecov_token: 4dc9e7e2-6b01-4932-a180-847b52b43d35 # Get a new one from https://codecov.io/
|
||||||
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages/
|
NUGET_PACKAGES: ${{ github.workspace }}/.nuget/packages/
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
|
@ -25,7 +25,7 @@ You should install the version specified in `global.json` or a later version wit
|
||||||
the same major.minor.Bxx "hundreds" band.
|
the same major.minor.Bxx "hundreds" band.
|
||||||
For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310
|
For example if 2.2.300 is specified, you may install 2.2.300, 2.2.301, or 2.2.310
|
||||||
while the 2.2.400 version would not be considered compatible by .NET SDK.
|
while the 2.2.400 version would not be considered compatible by .NET SDK.
|
||||||
See [.NET Core Versioning](https://docs.microsoft.com/en-us/dotnet/core/versions/) for more information.
|
See [.NET Core Versioning](https://docs.microsoft.com/dotnet/core/versions/) for more information.
|
||||||
|
|
||||||
## Package restore
|
## Package restore
|
||||||
|
|
||||||
|
@ -39,4 +39,4 @@ This repository can be built on Windows, Linux, and OSX.
|
||||||
|
|
||||||
Building, testing, and packing this repository can be done by using the standard dotnet CLI commands (e.g. `dotnet build`, `dotnet test`, `dotnet pack`, etc.).
|
Building, testing, and packing this repository can be done by using the standard dotnet CLI commands (e.g. `dotnet build`, `dotnet test`, `dotnet pack`, etc.).
|
||||||
|
|
||||||
[pwsh]: https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell?view=powershell-6
|
[pwsh]: https://docs.microsoft.com/powershell/scripting/install/installing-powershell?view=powershell-6
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
|
<PackageReference Include="Microsoft.VisualStudio.Internal.MicroBuild.VisualStudio" Version="$(MicroBuildVersion)" PrivateAssets="all" />
|
||||||
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
|
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
|
||||||
<!-- <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" /> -->
|
<!-- <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" /> -->
|
||||||
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.108" PrivateAssets="all" />
|
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109" PrivateAssets="all" />
|
||||||
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
|
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
|
||||||
<!-- Use the Unstable package ID so that update tools will help us keep it current even though it seems to be ever-unstable lately. -->
|
<!-- Use the Unstable package ID so that update tools will help us keep it current even though it seems to be ever-unstable lately. -->
|
||||||
<PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" PrivateAssets="all" />
|
<PackageReference Include="StyleCop.Analyzers.Unstable" Version="1.2.0.435" PrivateAssets="all" />
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
|
|
||||||
* Follow the best and simplest patterns of build, pack and test with dotnet CLI.
|
* Follow the best and simplest patterns of build, pack and test with dotnet CLI.
|
||||||
* Init script that installs prerequisites and auth helpers, supporting both non-elevation and elevation modes.
|
* Init script that installs prerequisites and auth helpers, supporting both non-elevation and elevation modes.
|
||||||
* Static analyzers: [FxCop](https://docs.microsoft.com/en-us/visualstudio/code-quality/fxcop-analyzers?view=vs-2019) and [StyleCop](https://github.com/DotNetAnalyzers/StyleCopAnalyzers)
|
* Static analyzers: default [Code Analysis](https://docs.microsoft.com/dotnet/fundamentals/code-analysis/overview) and [StyleCop](https://github.com/DotNetAnalyzers/StyleCopAnalyzers)
|
||||||
* Read-only source tree (builds to top-level bin/obj folders)
|
* Read-only source tree (builds to top-level bin/obj folders)
|
||||||
* Auto-versioning (via [Nerdbank.GitVersioning](https://github.com/dotnet/nerdbank.gitversioning))
|
* Auto-versioning (via [Nerdbank.GitVersioning](https://github.com/dotnet/nerdbank.gitversioning))
|
||||||
* Builds with a "pinned" .NET Core SDK to ensure reproducible builds across machines and across time.
|
* Builds with a "pinned" .NET Core SDK to ensure reproducible builds across machines and across time.
|
||||||
|
@ -82,6 +82,8 @@ We create the merge commit with these commands:
|
||||||
1. Run `git commit-tree -p HEAD -p A B -m "Merged latest Library.Template"`, where `A` is the output from `git rev-parse HEAD` that you recorded earlier, and `B` is the output from your prior `git write-tree` command.
|
1. Run `git commit-tree -p HEAD -p A B -m "Merged latest Library.Template"`, where `A` is the output from `git rev-parse HEAD` that you recorded earlier, and `B` is the output from your prior `git write-tree` command.
|
||||||
1. Run `git merge X` where `X` is the output of the `git commit-tree` command.
|
1. Run `git merge X` where `X` is the output of the `git commit-tree` command.
|
||||||
|
|
||||||
|
**IMPORTANT**: If using a pull request to get your changes into your repo, you must *merge* your PR. If you *squash* your PR, history will be lost and you will have to repeatedly resolve the same merge conflicts at the next Library.Template update.
|
||||||
|
|
||||||
**CAUTION**: when merging this for the first time, a github-hosted repo may close issues in your repo with the same number as issues that this repo closed in git commit messages.
|
**CAUTION**: when merging this for the first time, a github-hosted repo may close issues in your repo with the same number as issues that this repo closed in git commit messages.
|
||||||
Verify after completing your PR by visiting your github closed issues, sorted by recently updated, and reactivate any that were inadvertently closed by this merge.
|
Verify after completing your PR by visiting your github closed issues, sorted by recently updated, and reactivate any that were inadvertently closed by this merge.
|
||||||
This shouldn't be a recurring issue because going forward, we will avoid referencing github issues with simple `#123` syntax in this repo's history.
|
This shouldn't be a recurring issue because going forward, we will avoid referencing github issues with simple `#123` syntax in this repo's history.
|
||||||
|
|
|
@ -12,7 +12,7 @@ If you believe you have found a security vulnerability in any Microsoft-owned re
|
||||||
|
|
||||||
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
|
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://msrc.microsoft.com/create-report).
|
||||||
|
|
||||||
If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/en-us/msrc/pgp-key-msrc).
|
If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://www.microsoft.com/msrc/pgp-key-msrc).
|
||||||
|
|
||||||
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
|
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc).
|
||||||
|
|
||||||
|
@ -36,6 +36,6 @@ We prefer all communications to be in English.
|
||||||
|
|
||||||
## Policy
|
## Policy
|
||||||
|
|
||||||
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/en-us/msrc/cvd).
|
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://www.microsoft.com/msrc/cvd).
|
||||||
|
|
||||||
<!-- END MICROSOFT SECURITY.MD BLOCK -->
|
<!-- END MICROSOFT SECURITY.MD BLOCK -->
|
||||||
|
|
|
@ -18,7 +18,7 @@ Write-Progress -Activity $ActivityName -CurrentOperation "Discovery PDB files"
|
||||||
$PDBs = Get-ChildItem -rec "$Path/*.pdb"
|
$PDBs = Get-ChildItem -rec "$Path/*.pdb"
|
||||||
|
|
||||||
# Filter PDBs to product OR test related.
|
# Filter PDBs to product OR test related.
|
||||||
$testregex = "unittest|tests"
|
$testregex = "unittest|tests|\.test\."
|
||||||
|
|
||||||
Write-Progress -Activity $ActivityName -CurrentOperation "De-duplicating symbols"
|
Write-Progress -Activity $ActivityName -CurrentOperation "De-duplicating symbols"
|
||||||
$PDBsByHash = @{}
|
$PDBsByHash = @{}
|
||||||
|
|
|
@ -20,11 +20,11 @@ steps:
|
||||||
displayName: 📢 Publish artifacts
|
displayName: 📢 Publish artifacts
|
||||||
condition: succeededOrFailed()
|
condition: succeededOrFailed()
|
||||||
|
|
||||||
- powershell: |
|
- ${{ if and(ne(variables['codecov_token'], ''), parameters.RunTests) }}:
|
||||||
$ArtifactStagingFolder = & "azure-pipelines/Get-ArtifactsStagingDirectory.ps1"
|
- powershell: |
|
||||||
$CoverageResultsFolder = Join-Path $ArtifactStagingFolder "coverageResults-$(Agent.JobName)"
|
$ArtifactStagingFolder = & "azure-pipelines/Get-ArtifactsStagingDirectory.ps1"
|
||||||
azure-pipelines/publish-CodeCov.ps1 -CodeCovToken "$(codecov_token)" -PathToCodeCoverage "$CoverageResultsFolder" -Name "$(Agent.JobName) Coverage Results" -Flags "$(Agent.JobName)Host,$(BuildConfiguration)"
|
$CoverageResultsFolder = Join-Path $ArtifactStagingFolder "coverageResults-$(Agent.JobName)"
|
||||||
displayName: 📢 Publish code coverage results to codecov.io
|
azure-pipelines/publish-CodeCov.ps1 -CodeCovToken "$(codecov_token)" -PathToCodeCoverage "$CoverageResultsFolder" -Name "$(Agent.JobName) Coverage Results" -Flags "$(Agent.JobName)Host,$(BuildConfiguration)"
|
||||||
condition: ne(variables['codecov_token'], '')
|
displayName: 📢 Publish code coverage results to codecov.io
|
||||||
timeoutInMinutes: 3
|
timeoutInMinutes: 3
|
||||||
continueOnError: true
|
continueOnError: true
|
||||||
|
|
|
@ -10,9 +10,9 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
|
||||||
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
|
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.2" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче