Skip to content

Commit eb93294

Browse files
authored
Merge pull request #307 from microsoft/dev/andarno/libtemplateUpdate
Merge latest Library.Template
2 parents 919ad1e + e6ea712 commit eb93294

File tree

11 files changed

+45
-9
lines changed

11 files changed

+45
-9
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Refer to https://hub.docker.com/_/microsoft-dotnet-sdk for available versions
2-
FROM mcr.microsoft.com/dotnet/sdk:9.0.301-noble@sha256:4fd7d3e5aeb6cfb75e923a54cdb0b6e858b27ad3b517837917c57c2e632b5694
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.304-noble@sha256:1f7ccf88e076bc1cb1ddbd81959fb55b886b01851b092867bb7a638435fa1f1f
33

44
# Installing mono makes `dotnet test` work without errors even for net472.
55
# But installing it takes a long time, so it's excluded by default.

.github/copilot-instructions.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copilot instructions for this repository
2+
3+
## High level guidance
4+
5+
* Review the `CONTRIBUTING.md` file for instructions to build and test the software.
6+
* Set the `NBGV_GitEngine` environment variable to `Disabled` before running any `dotnet` or `msbuild` commands.
7+
8+
## Software Design
9+
10+
* Design APIs to be highly testable, and all functionality should be tested.
11+
* Avoid introducing binary breaking changes in public APIs of projects under `src` unless their project files have `IsPackable` set to `false`.
12+
13+
## Testing
14+
15+
* There should generally be one test project (under the `test` directory) per shipping project (under the `src` directory). Test projects are named after the project being tested with a `.Test` suffix.
16+
* Tests should use the Xunit testing framework.
17+
18+
## Coding style
19+
20+
* Honor StyleCop rules and fix any reported build warnings *after* getting tests to pass.
21+
* In C# files, use namespace *statements* instead of namespace *blocks* for all new files.
22+
* Add API doc comments to all new public and internal members.

.github/workflows/docs_validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
1919
- name: 🔗 Markup Link Checker (mlc)
20-
uses: becheran/mlc@88c9db09b8dabab813a2edd13f955b36aa73657a # v0.22.0
20+
uses: becheran/mlc@18a06b3aa2901ca197de59c8b0b1f54fdba6b3fa # v1.0.0
2121
with:
2222
args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/* -p docfx -i https://aka.ms/onboardsupport,https://aka.ms/spot,https://msrc.microsoft.com/*,https://www.microsoft.com/msrc*,https://microsoft.com/msrc*
2323
- name: ⚙ Install prerequisites

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77

8-
<MicroBuildVersion>2.0.198</MicroBuildVersion>
8+
<MicroBuildVersion>2.0.199</MicroBuildVersion>
99
</PropertyGroup>
1010
<ItemGroup>
1111
<PackageVersion Include="Microsoft.CodeAnalysis.ResxSourceGenerator" Version="3.11.0-beta1.25076.3" />
@@ -14,8 +14,8 @@
1414
<ItemGroup Label="Library.Template">
1515
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1616
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
17-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
18-
<PackageVersion Include="xunit.v3" Version="2.0.3" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
18+
<PackageVersion Include="xunit.v3" Version="3.0.0" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<!-- Put repo-specific GlobalPackageReference items in this group. -->

azure-pipelines/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ jobs:
244244
parameters:
245245
Is1ESPT: ${{ parameters.Is1ESPT }}
246246
RunTests: ${{ parameters.RunTests }}
247+
BuildRequiresAccessToken: ${{ parameters.RealSign }} # Real signing on non-Windows machines requires passing through access token to build steps that sign
247248
- ${{ if parameters.EnableDotNetFormatCheck }}:
248249
- script: dotnet format --verify-no-changes
249250
displayName: 💅 Verify formatted code
@@ -279,6 +280,7 @@ jobs:
279280
parameters:
280281
Is1ESPT: ${{ parameters.Is1ESPT }}
281282
RunTests: ${{ parameters.RunTests }}
283+
BuildRequiresAccessToken: ${{ parameters.RealSign }} # Real signing on non-Windows machines requires passing through access token to build steps that sign
282284

283285
- job: WrapUp
284286
dependsOn:

azure-pipelines/dotnet.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,17 @@ parameters:
55
default: false
66
- name: Is1ESPT
77
type: boolean
8+
- name: BuildRequiresAccessToken
9+
type: boolean
10+
default: false
811

912
steps:
1013

1114
- script: dotnet build -t:build,pack --no-restore -c $(BuildConfiguration) -warnAsError -warnNotAsError:NU1901,NU1902,NU1903,NU1904,LOCTASK002 /bl:"$(Build.ArtifactStagingDirectory)/build_logs/build.binlog"
1215
displayName: 🛠 dotnet build
16+
${{ if parameters.BuildRequiresAccessToken }}:
17+
env:
18+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
1319

1420
- ${{ if not(parameters.IsOptProf) }}:
1521
- powershell: tools/dotnet-test-cloud.ps1 -Configuration $(BuildConfiguration) -Agent $(Agent.JobName) -PublishResults

azure-pipelines/libtemplate-update.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ extends:
3535
name: AzurePipelines-EO
3636
demands:
3737
- ImageOverride -equals 1ESPT-Windows2022
38+
credscan:
39+
enabled: false
3840

3941
stages:
4042
- stage: Merge

azure-pipelines/microbuild.before.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ parameters:
1717
steps:
1818
- ${{ if and(not(parameters.IsOptProf), ne(variables['Build.Reason'], 'PullRequest')) }}:
1919
# notice@0 requires CG detection to run first, and non-default branches don't inject it automatically.
20-
- ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/main') }}:
21-
- task: ComponentGovernanceComponentDetection@0
22-
displayName: 🔍 Component Detection
20+
# default branch injection (main) is happening too late for notice@0 to run successfully. Adding this as a workaround.
21+
- task: ComponentGovernanceComponentDetection@0
22+
displayName: 🔍 Component Detection
2323

2424
- task: notice@0
2525
displayName: 🛠️ Generate NOTICE file

azure-pipelines/unofficial.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ extends:
5656
parameters:
5757
sdl:
5858
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
59+
credscan:
60+
enabled: false
5961
suppression:
6062
suppressionFile: $(System.DefaultWorkingDirectory)\azure-pipelines\falsepositives.gdnsuppress
6163
enableProductionSDL: ${{ parameters.EnableProductionSDL }}

azure-pipelines/vs-validation.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ extends:
2828
parameters:
2929
sdl:
3030
sourceAnalysisPool: VSEngSS-MicroBuild2022-1ES
31+
credscan:
32+
enabled: false
3133

3234
stages:
3335
- stage: Build

0 commit comments

Comments
 (0)