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
2 changes: 1 addition & 1 deletion .github/workflows/stack-dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
dotnet-versions:
description: JSON list of .NET SDK versions, all installed side by side
type: string
default: '["8.0","9.0"]'
default: '["10.0"]'
os:
description: JSON list of runner labels
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
with:
working-directory: fixtures/dotnet
os: ${{ github.event_name == 'push' && '["ubuntu-latest","windows-latest"]' || '["ubuntu-latest"]' }}
dotnet-versions: '["8.0","9.0"]'
dotnet-versions: '["10.0"]'
commands: '["dotnet restore","dotnet format --verify-no-changes --no-restore","dotnet build --no-restore","dotnet test --no-build"]'
go:
needs: changes
Expand Down
2 changes: 1 addition & 1 deletion fixtures/dotnet/Fixture.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/platforms/gitlab-jobs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export function stackJobs(stack: ResolvedStack): Array<{ key: string; job: Job }
return [{ key: stack.id, job: perVersion(image, "JAVA_VERSION", list(input, "java-versions"), commands) }];
}
if (stack.id === "dotnet") {
const [newest = "9.0", ...older] = newestFirst(list(input, "dotnet-versions"));
const [newest = "10.0", ...older] = newestFirst(list(input, "dotnet-versions"));
return [
{
key: "dotnet",
Expand Down
2 changes: 1 addition & 1 deletion src/stacks/dotnet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const dotnetStack: StackPack = {
ci: {
workflow: "stack-dotnet.yml",
with: {
"dotnet-versions": JSON.stringify(stringList("dotnet", options, "versions") ?? ["8.0", "9.0"]),
"dotnet-versions": JSON.stringify(stringList("dotnet", options, "versions") ?? ["10.0"]),
os: JSON.stringify(stringList("dotnet", options, "os") ?? ["ubuntu-latest"]),
commands: JSON.stringify([
`dotnet restore${target}`,
Expand Down
3 changes: 3 additions & 0 deletions test/platforms-gitlab-stacks.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ describe("gitlab ci for the other stacks", () => {
"<Project>\n <PropertyGroup>\n <Version>0.1.0</Version>\n </PropertyGroup>\n</Project>\n",
});
expectBump(versioned, ["Directory.Build.props"]);
// with no versions set, the .NET 10 SDK alone
expect(versioned.ci.dotnet?.image).toBe("mcr.microsoft.com/dotnet/sdk:10.0");
expect(versioned.ci.dotnet?.script?.[0]).toBe("dotnet restore");
});

it("script: a job per kind of script, with the versions the GitHub workflow pins", async () => {
Expand Down
2 changes: 1 addition & 1 deletion test/stacks-dotnet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ it("restores, checks formatting, builds and tests, and releases through Director
expect(stack.ci).toEqual({
workflow: "stack-dotnet.yml",
with: {
"dotnet-versions": '["8.0","9.0"]',
"dotnet-versions": '["10.0"]',
os: '["ubuntu-latest"]',
commands:
'["dotnet restore","dotnet format --verify-no-changes --no-restore","dotnet build --no-restore","dotnet test --no-build"]',
Expand Down
Loading