Skip to content

Commit 28bc39a

Browse files
committed
Merge the microbuild branch from https://github.com/aarnott/Library.Template
Specifically, this merges [73b7e11 from that repo](AArnott/Library.Template@73b7e11).
2 parents d3a3420 + 73b7e11 commit 28bc39a

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
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.301-noble@sha256:21cd104bae759d9787f99a7d9a9d0e431f9360ee373909bbbfd4b8da07a7e3d9
2+
FROM mcr.microsoft.com/dotnet/sdk:9.0.301-noble@sha256:f353951d75cd99696c912ba7a29a1c6905fe0c1c7613e12e5318efed40d9b287
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.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>

0 commit comments

Comments
 (0)