Skip to content

Commit f2bbdaa

Browse files
AArnottrenovate[bot]Skylar Nam
authored
Merge latest Library.Template (#302)
* Update becheran/mlc action to v0.22.0 * Pin actions/checkout * Update xunit Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update Dockerfile and global.json updates to v9.0.301 (#376) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Add copilot swe agent setup instructions (#377) * Touch-up name of github workflow * Bump MicroBuild to 2.0.198 * Enable PME signing for Library.Template * Fix expand-template.yml indentation * Focus binskim on just the binaries we build * Build for OptProf with test signed bits Real signing can only be used for official builds. * Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to 21cd104 (#379) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to f353951 (#380) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency powershell to 7.5.2 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Re-enable static graph nuget restore * Update becheran/mlc action to v1 (#383) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to 2346351 (#382) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update mcr.microsoft.com/dotnet/sdk:9.0.301-noble Docker digest to 4fd7d3e (#384) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Skylar Nam <[email protected]>
2 parents 28c8231 + b34ebbc commit f2bbdaa

File tree

9 files changed

+56
-10
lines changed

9 files changed

+56
-10
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"powershell": {
6-
"version": "7.5.1",
6+
"version": "7.5.2",
77
"commands": [
88
"pwsh"
99
],

‎.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.300-noble@sha256:9f7bd4d010026e15a57d9cf876f2f7d08c3eeed6a0ea987b8c5ba8c75e68e948
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.301-noble@sha256:4fd7d3e5aeb6cfb75e923a54cdb0b6e858b27ad3b517837917c57c2e632b5694
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/workflows/copilot-setup-steps.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: 💪🏼 Copilot Setup Steps
2+
3+
# Automatically run the setup steps when they are changed to allow for easy validation, and
4+
# allow manual testing through the repository's "Actions" tab
5+
on:
6+
workflow_dispatch:
7+
push:
8+
branches:
9+
- main
10+
paths:
11+
- .github/workflows/copilot-setup-steps.yml
12+
pull_request:
13+
paths:
14+
- .github/workflows/copilot-setup-steps.yml
15+
16+
jobs:
17+
# The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
18+
copilot-setup-steps:
19+
runs-on: ubuntu-latest
20+
# Set the permissions to the lowest permissions possible needed for your steps.
21+
# Copilot will be given its own token for its operations.
22+
permissions:
23+
# If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
24+
contents: read
25+
26+
# You can define any steps you want, and they will run before the agent starts.
27+
# If you do not check out your code, Copilot will do this for you.
28+
steps:
29+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
30+
with:
31+
fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
32+
- name: ⚙ Install prerequisites
33+
run: |
34+
./init.ps1 -UpgradePrerequisites -NoNuGetCredProvider
35+
dotnet --info
36+
37+
# Print mono version if it is present.
38+
if (Get-Command mono -ErrorAction SilentlyContinue) {
39+
mono --version
40+
}
41+
shell: pwsh

‎.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@c925f90a9a25e16e4c4bfa29058f6f9ffa9f0d8c # v0.21.0
20+
uses: becheran/mlc@88c9db09b8dabab813a2edd13f955b36aa73657a # v0.22.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.Build.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
<EnableDynamicPlatformResolution>true</EnableDynamicPlatformResolution>
2020

2121
<!-- Opt in till https://github.com/NuGet/Home/issues/9803 makes this the default. -->
22-
<!-- Opt back out until an SDK with the fix for https://github.com/NuGet/Home/issues/12177 is generally available. -->
23-
<RestoreUseStaticGraphEvaluation>false</RestoreUseStaticGraphEvaluation>
22+
<RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
2423

2524
<!-- This entire repo has just one version.json file, so compute the version once and share with all projects in a large build. -->
2625
<GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>

‎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.187</MicroBuildVersion>
8+
<MicroBuildVersion>2.0.198</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.0" />
18-
<PackageVersion Include="xunit.v3" Version="2.0.2" />
17+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
18+
<PackageVersion Include="xunit.v3" Version="2.0.3" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<!-- Put repo-specific GlobalPackageReference items in this group. -->

‎azure-pipelines/build.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
zipSources: false
119119
${{ if parameters.RealSign }}:
120120
signType: real
121+
signWithProd: true
121122
${{ else }}:
122123
signType: test
123124
sbom:
@@ -140,6 +141,9 @@ jobs:
140141
- ${{ if parameters.EnableOptProf }}:
141142
- powershell: Write-Host "##vso[task.setvariable variable=PROFILINGINPUTSDROPNAME]$(tools/variables/ProfilingInputsDropName.ps1)"
142143
displayName: ⚙ Set ProfilingInputsDropName for optprof
144+
sdl:
145+
binskim:
146+
analyzeTargetGlob: $(Build.ArtifactStagingDirectory)\symbols-Windows\**
143147

144148
outputParentDirectory: $(Build.ArtifactStagingDirectory)
145149
outputs:
@@ -221,6 +225,7 @@ jobs:
221225
signing:
222226
enabled: false # enable when building unique artifacts on this agent that must be signed
223227
signType: real
228+
signWithProd: true
224229
outputParentDirectory: $(Build.ArtifactStagingDirectory)
225230
outputs:
226231
- ${{ each artifact_name in parameters.artifact_names }}:
@@ -255,6 +260,7 @@ jobs:
255260
signing:
256261
enabled: false # enable when building unique artifacts on this agent that must be signed
257262
signType: real
263+
signWithProd: true
258264
outputParentDirectory: $(Build.ArtifactStagingDirectory)
259265
outputs:
260266
- ${{ each artifact_name in parameters.artifact_names }}:

‎azure-pipelines/microbuild.before.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ steps:
4242

4343
- task: MicroBuildSigningPlugin@4
4444
inputs:
45-
signType: Real
45+
signType: Test
4646
zipSources: false
4747
displayName: 🔧 Install MicroBuild Signing Plugin
4848

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.300",
3+
"version": "9.0.301",
44
"rollForward": "patch",
55
"allowPrerelease": false
66
},

0 commit comments

Comments
 (0)