Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release ValueTask converted client package #1679

Merged
merged 3 commits into from
Oct 21, 2023
Merged

Release ValueTask converted client package #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65d9785
Fix merge build errors
Cyberboss Oct 21, 2023
232aa67
Version bump client and common library versions
Cyberboss Oct 20, 2023
6d674a7
Add explicit dependency on common csproj to client
Cyberboss Oct 20, 2023
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 build/Version.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<TgsCoreVersion>5.16.2</TgsCoreVersion>
<TgsConfigVersion>4.7.1</TgsConfigVersion>
<TgsApiVersion>9.12.0</TgsApiVersion>
<TgsCommonLibraryVersion>6.0.1</TgsCommonLibraryVersion>
<TgsCommonLibraryVersion>7.0.0</TgsCommonLibraryVersion>
<TgsApiLibraryVersion>11.1.2</TgsApiLibraryVersion>
<TgsClientVersion>12.1.2</TgsClientVersion>
<TgsClientVersion>13.0.0</TgsClientVersion>
<TgsDmapiVersion>6.5.3</TgsDmapiVersion>
<TgsInteropVersion>5.6.1</TgsInteropVersion>
<TgsHostWatchdogVersion>1.4.0</TgsHostWatchdogVersion>
Expand Down
1 change: 1 addition & 0 deletions src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<ItemGroup>
<ProjectReference Include="..\Tgstation.Server.Api\Tgstation.Server.Api.csproj" />
<ProjectReference Include="..\Tgstation.Server.Common\Tgstation.Server.Common.csproj" /> <!-- Needed for explicit nuget versioning -->
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions tests/Tgstation.Server.Tests/Live/TestLiveServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ await ioManager.CopyDirectory(
if (postWriteHandler.NeedsPostWrite(src))
postWriteHandler.HandleWrite(dest);

return Task.CompletedTask;
return ValueTask.CompletedTask;
},
ioManager.ConcatPath(
localRepoPath,
Expand Down Expand Up @@ -1080,7 +1080,7 @@ async ValueTask RunGitCommand(string args)
jobWaitTask = jobsTest.WaitForJob(repoResponse.ActiveJob, 300, false, null, cancellationToken);
}

await Task.WhenAll(jobWaitTask, ddUpdateTask, dmUpdateTask);
await Task.WhenAll(jobWaitTask, ddUpdateTask.AsTask(), dmUpdateTask.AsTask());

var depsBytesTask = ioManager.ReadAllBytes(
ioManager.ConcatPath(repoPath, "dependencies.sh"),
Expand All @@ -1093,7 +1093,7 @@ async ValueTask RunGitCommand(string args)
if (postWriteHandler.NeedsPostWrite(src))
postWriteHandler.HandleWrite(dest);

return Task.CompletedTask;
return ValueTask.CompletedTask;
},
ioManager.ConcatPath(
repoPath,
Expand All @@ -1120,7 +1120,7 @@ async ValueTask RunGitCommand(string args)

var byondJobTask = jobsTest.WaitForJob(byondJob.InstallJob, 60, false, null, cancellationToken);

await Task.WhenAll(scriptsCopyTask, byondJobTask);
await Task.WhenAll(scriptsCopyTask.AsTask(), byondJobTask);

var compileJob = await instanceClient.DreamMaker.Compile(cancellationToken);

Expand Down