Skip to content

Commit 7fb4921

Browse files
committed
Merge remote-tracking branch 'origin/main' into microbuild
2 parents d064af0 + d87da7a commit 7fb4921

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
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:8.0.201-jammy
2+
FROM mcr.microsoft.com/dotnet/sdk:8.0.300-jammy
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.

.editorconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ indent_size = 2
2626
# Xml config files
2727
[*.{ruleset,config,nuspec,resx,vsixmanifest,vsct,runsettings}]
2828
indent_size = 2
29+
indent_style = space
2930

3031
# JSON files
3132
[*.json]

Directory.Packages.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<MicroBuildVersion>2.0.152</MicroBuildVersion>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1212
<PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
13-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
14-
<PackageVersion Include="xunit" Version="2.8.0" />
13+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
14+
<PackageVersion Include="xunit" Version="2.8.1" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<GlobalPackageReference Include="CSharpIsNullAnalyzer" Version="0.1.495" />

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

0 commit comments

Comments
 (0)