Skip to content

Commit c028455

Browse files
committed
Merge branch 'main' into microbuild
2 parents 5ae59c1 + 94431e7 commit c028455

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
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.203-noble@sha256:c84968764a7d265a29cc840096750816d82655369d6ad03bcdf65f790684fd21
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.300-noble@sha256:58fa5442c6da3bd654cab866fd6668de2713769511e412a3aa23c14368b84b16
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.

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- Put repo-specific PackageVersion items in this group. -->
1212
</ItemGroup>
1313
<ItemGroup Label="Library.Template">
14-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
1515
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
1616
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.0" />
1717
<PackageVersion Include="xunit.v3" Version="2.0.2" />

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.203",
3+
"version": "9.0.300",
44
"rollForward": "patch",
55
"allowPrerelease": false
66
},

0 commit comments

Comments
 (0)