Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
10.0.x

- name: Restore
run: dotnet restore
run: dotnet restore --locked-mode

- name: Build
run: dotnet build --configuration Release --no-restore /p:ContinuousIntegrationBuild=true
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
10.0.x

- name: Restore
run: dotnet restore
run: dotnet restore --locked-mode

- name: Build
run: dotnet build --configuration Release --no-restore
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
fi

- name: Restore
run: dotnet restore
run: dotnet restore --locked-mode

- name: Build
run: >
Expand Down
7 changes: 7 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<Project>

<PropertyGroup>
<!--
Writes the resolved dependency graph to a packages.lock.json beside each project. CI restores
in locked mode, so a graph that drifts from the lock fails the build rather than quietly
resolving to something else. Changing a version in Directory.Packages.props now also means
regenerating the locks; a restore with the force-evaluate switch does that.
-->
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
8 changes: 8 additions & 0 deletions samples/Healthie.AppHost/Healthie.AppHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
runs on CI and on arm64. Acknowledged deliberately rather than reverting to the Windows one.
-->
<NoWarn>$(NoWarn);ASPIRECOSMOSDB001</NoWarn>
<!--
The one project that opts out of the repository's lock files. The Aspire SDK adds a
runtime-specific Aspire.Dashboard.Sdk package, so the resolved graph differs per operating
system: a lock generated on Windows names win-x64 and a Linux restore then asks for
linux-x64 and fails as inconsistent. A lock file cannot describe a graph that depends on
where the restore runs, and this is a sample orchestrator rather than anything shipped.
-->
<RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions samples/Healthie.Sample.BlazorUI/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ WORKDIR /src
# Restore against the manifests alone first, so this layer is only rebuilt when dependencies change.
COPY Directory.Build.props Directory.Packages.props ./
COPY src/ src/
COPY samples/Healthie.Sample.BlazorUI/Healthie.Sample.BlazorUI.csproj samples/Healthie.Sample.BlazorUI/
RUN dotnet restore samples/Healthie.Sample.BlazorUI/Healthie.Sample.BlazorUI.csproj
COPY samples/Healthie.Sample.BlazorUI/Healthie.Sample.BlazorUI.csproj samples/Healthie.Sample.BlazorUI/packages.lock.json samples/Healthie.Sample.BlazorUI/
RUN dotnet restore samples/Healthie.Sample.BlazorUI/Healthie.Sample.BlazorUI.csproj --locked-mode

COPY samples/ samples/
RUN dotnet publish samples/Healthie.Sample.BlazorUI/Healthie.Sample.BlazorUI.csproj \
Expand Down
Loading
Loading