Skip to content

Commit ebd6a2f

Browse files
committed
Merge remote-tracking branch 'origin/main' into microbuild
2 parents e427b3f + 4e511af commit ebd6a2f

File tree

4 files changed

+45
-4
lines changed

4 files changed

+45
-4
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.300-noble@sha256:9f7bd4d010026e15a57d9cf876f2f7d08c3eeed6a0ea987b8c5ba8c75e68e948
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.301-noble@sha256:4f50505b5344e9d8a76805d71bb4ba76da6b01656e17a66a8ce1e4c4dfaaec12
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.
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

Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<ItemGroup Label="Library.Template">
1414
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1515
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
16-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
17-
<PackageVersion Include="xunit.v3" Version="2.0.2" />
16+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
17+
<PackageVersion Include="xunit.v3" Version="2.0.3" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<!-- Put repo-specific GlobalPackageReference items in this group. -->

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)