Skip to content

Commit

Permalink
Fix package validation (#2138)
Browse files Browse the repository at this point in the history
- Fix the package validation job not failing if there are any issues.
- Move configuration of deterministic builds to MSBuild, rather than setting it from Cake, as this appears to have stopped working with the .NET 8.0.300 SDK.
  • Loading branch information
martincostello committed May 31, 2024
1 parent 77a655d commit 303d9d0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ jobs:
}
if ($invalidPackages -gt 0) {
Write-Output "::error::$invalidPackages NuGet package(s) failed validation."
exit 1
}
sign:
Expand Down Expand Up @@ -246,6 +247,7 @@ jobs:
}
if ($invalidPackages -gt 0) {
Write-Output "::error::$invalidPackages NuGet package(s) failed validation."
exit 1
}
- name: Checkout vcsjones/AuthenticodeLint
Expand Down
4 changes: 4 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,8 @@
<PropertyGroup>
<UseArtifactsOutput>true</UseArtifactsOutput>
</PropertyGroup>
<PropertyGroup Condition=" '$(CI)' == 'true' ">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<Deterministic>true</Deterministic>
</PropertyGroup>
</Project>
3 changes: 0 additions & 3 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ Task("__BuildSolutions")
},
};
dotNetBuildSettings.MSBuildSettings.Properties["ContinuousIntegrationBuild"] = [Environment.GetEnvironmentVariable("CI") ?? "false"];
dotNetBuildSettings.MSBuildSettings.Properties["Deterministic"] = ["true"];
DotNetBuild(solution.ToString(), dotNetBuildSettings);
}
});
Expand Down

0 comments on commit 303d9d0

Please sign in to comment.