Skip to content
This repository was archived by the owner on May 10, 2023. It is now read-only.

Update dependencies to latest #97

Open
slewis74 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update dependencies to latest #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</PropertyGroup>

<ItemGroup>
<PackageDownload Include="OctoVersion.Tool" Version="[0.2.645]"/>
<PackageReference Include="Nuke.Common" Version="5.3.0"/>
<PackageDownload Include="JetBrains.ReSharper.GlobalTools" Version="[2021.2.0]"/>
<PackageReference Include="Octopus.NukeBuildComponents" Version="0.1.29"/>
<PackageDownload Include="OctoVersion.Tool" Version="[0.2.645]" />
<PackageReference Include="Nuke.Common" Version="6.0.1" />
<PackageDownload Include="JetBrains.ReSharper.GlobalTools" Version="[2021.2.0]" />
<PackageReference Include="Octopus.NukeBuildComponents" Version="0.1.29" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion source/Client/Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<RepositoryUrl>https://github.com/OctopusDeploy/JiraIntegration</RepositoryUrl>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Octopus.Server.Client" Version="11.2.3319"/>
<PackageReference Include="Octopus.Server.Client" Version="13.0.3731" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions source/Server.E2E.Tests/Server.E2E.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4"/>
<PackageReference Include="NSubstitute" Version="3.1.0"/>
<PackageReference Include="NUnit" Version="3.13.1"/>
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0"/>
<PackageReference Include="Octopus.Server.Extensibility" Version="14.3.126"/>
<PackageReference Include="Octopus.Server.Extensibility.JiraIntegration" Version="8.3.4"/>
<PackageReference Include="Shouldly" Version="4.0.3"/>
<PackageReference Include="Titanium.Web.Proxy" Version="3.1.1400-beta"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Octopus.Server.Extensibility" Version="14.3.126" />
<PackageReference Include="Octopus.Server.Extensibility.JiraIntegration" Version="8.3.4" />
<PackageReference Include="Shouldly" Version="4.0.3" />
<PackageReference Include="Titanium.Web.Proxy" Version="3.1.1400-beta" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Server\Server.csproj"/>
<ProjectReference Include="..\Server\Server.csproj" />
</ItemGroup>
</Project>
16 changes: 8 additions & 8 deletions source/Server.Tests/Server.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<AssemblyName>Octopus.Server.Extensibility.JiraIntegration.Tests</AssemblyName>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Assent" Version="1.4.2"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1"/>
<PackageReference Include="NSubstitute" Version="3.1.0"/>
<PackageReference Include="NUnit" Version="3.13.2"/>
<PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
<PackageReference Include="Octokit" Version="0.32.0"/>
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.15"/>
<PackageReference Include="Assent" Version="1.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="NSubstitute" Version="4.3.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
<PackageReference Include="Octokit" Version="0.50.0" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Server\Server.csproj"/>
<ProjectReference Include="..\Server\Server.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion source/Server/Deployments/JiraDeployment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ async Task<OctopusJiraPayloadData> PrepareOctopusJiraPayload(string eventType,
{
new JiraDeploymentData
{
DeploymentSequenceNumber = int.Parse(deployment.Id!.ToString().Split('-')[1]),
DeploymentSequenceNumber = int.Parse(deployment.Id!.ToString()!.Split('-')[1]),
UpdateSequenceNumber = DateTime.UtcNow.Ticks,
DisplayName = serverTask.Description,
Associations = new[]
Expand Down
2 changes: 1 addition & 1 deletion source/Server/Integration/JiraConnectAppClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public JiraConnectAppClient(
JsonConvert.DeserializeObject<JsonTokenData>(
result.Content.ReadAsStringAsync()
.GetAwaiter()
.GetResult());
.GetResult())!;
return authTokenFromConnectApp.Token;
}

Expand Down
12 changes: 6 additions & 6 deletions source/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Octopus.Data" Version="7.1.5"/>
<PackageReference Include="Octopus.Diagnostics" Version="2.1.2"/>
<PackageReference Include="Octopus.Server.Extensibility" Version="14.3.126"/>
<PackageReference Include="Octopus.Server.MessageContracts" Version="3.0.251"/>
<PackageReference Include="Octopus.Time" Version="1.1.6"/>
<PackageReference Include="Sashimi.Server.Contracts" Version="11.0.1"/>
<PackageReference Include="Octopus.Data" Version="7.1.5" />
<PackageReference Include="Octopus.Diagnostics" Version="2.1.2" />
<PackageReference Include="Octopus.Server.Extensibility" Version="14.3.126" />
<PackageReference Include="Octopus.Server.MessageContracts" Version="3.0.400" />
<PackageReference Include="Octopus.Time" Version="1.1.388" />
<PackageReference Include="Sashimi.Server.Contracts" Version="14.2.0" />
</ItemGroup>
</Project>
5 changes: 2 additions & 3 deletions source/Server/WorkItems/WorkItemLinkMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public IResultFromExtension<WorkItemLink[]> Map(OctopusBuildInformation buildInf
if (!IsEnabled)
return ResultFromExtension<WorkItemLink[]>.ExtensionDisabled();

if (string.IsNullOrEmpty(store.GetJiraUsername()) ||
string.IsNullOrEmpty(store.GetJiraPassword()?.Value))
if (string.IsNullOrEmpty(store.GetJiraUsername()) || string.IsNullOrEmpty(store.GetJiraPassword()?.Value))
return FailureWithLog("Username/password not configured");

var baseUrl = store.GetBaseUrl();
Expand Down Expand Up @@ -103,7 +102,7 @@ public string GetReleaseNote(JiraIssue issue, string? releaseNotePrefix)

var releaseNoteRegex = new Regex($"^{releaseNotePrefix}", RegexOptions.Compiled | RegexOptions.IgnoreCase);

var releaseNote = issue.Fields.Comments.Comments.Select(x => x.Body).Where(x => x is not null).LastOrDefault(c => releaseNoteRegex.IsMatch(c));
var releaseNote = issue.Fields.Comments.Comments.Select(x => x.Body).Where(x => x is not null).LastOrDefault(c => c is not null && releaseNoteRegex.IsMatch(c));
return !string.IsNullOrWhiteSpace(releaseNote)
? releaseNoteRegex.Replace(releaseNote, string.Empty)?.Trim() ?? string.Empty
: issue.Fields.Summary ?? issue.Key;
Expand Down