Skip to content

Commit 90c03e8

Browse files
committed
Improve robustness for Ubuntu
1 parent 040f79f commit 90c03e8

File tree

4 files changed

+20
-5
lines changed

4 files changed

+20
-5
lines changed

.github/workflows/release.yml

+9
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,12 @@ jobs:
3030
pfx: ${{ secrets.PFX }}
3131
pfxPassword: ${{ secrets.PFXPASSWORD }}
3232
nugetApiKey: ${{ secrets.NUGETAPIKEY }}
33+
34+
Tests-Ubuntu:
35+
runs-on: ubuntu-22.04 # Latest misses mono for .NET Framework
36+
37+
steps:
38+
- uses: actions/checkout@v4
39+
40+
- name: Test
41+
run: dotnet test -c Release

Sdk/Sdk.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ By integrating this SDK into your build process, you can easily generate install
4343
<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
4444
<PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.14" />
4545
<PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.1.0" />
46+
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.1.0" />
47+
<PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.1.1" />
4648
<PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="2.0.5" />
4749
<PackageReference Include="System.Text.Json" Version="9.0.1" />
4850
</ItemGroup>

SdkTests/Helpers/ProjectReferencesHelperTests.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
namespace SdkTests.Helpers
22
{
33
using FluentAssertions;
4+
5+
using Skyline.DataMiner.CICD.FileSystem;
46
using Skyline.DataMiner.CICD.Parsers.Common.VisualStudio.Projects;
57
using Skyline.DataMiner.Sdk.Helpers;
68

@@ -11,7 +13,7 @@ public class ProjectReferencesHelperTests
1113
public void TryResolveProjectReferencesTest_DefaultProjectReferences()
1214
{
1315
// Arrange
14-
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 1", "PackageProject", "PackageProject.csproj");
16+
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 1", "PackageProject", "PackageProject.csproj");
1517
Project packageProject = Project.Load(packageProjectPath);
1618

1719
// Act
@@ -31,7 +33,7 @@ public void TryResolveProjectReferencesTest_DefaultProjectReferences()
3133
public void TryResolveProjectReferencesTest_ExcludeScript()
3234
{
3335
// Arrange
34-
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 2", "PackageProject", "PackageProject.csproj");
36+
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 2", "PackageProject", "PackageProject.csproj");
3537
Project packageProject = Project.Load(packageProjectPath);
3638

3739
// Act
@@ -50,7 +52,7 @@ public void TryResolveProjectReferencesTest_ExcludeScript()
5052
public void TryResolveProjectReferencesTest_PackageProjectOnly()
5153
{
5254
// Arrange
53-
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 3", "MyPackage", "MyPackage.csproj");
55+
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 3", "MyPackage", "MyPackage.csproj");
5456
Project packageProject = Project.Load(packageProjectPath);
5557

5658
// Act
@@ -69,7 +71,7 @@ public void TryResolveProjectReferencesTest_PackageProjectOnly()
6971
public void TryResolveProjectReferencesTest_DefaultProjectReferences_NothingSpecifiedInFile()
7072
{
7173
// Arrange
72-
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 4", "PackageProject", "PackageProject.csproj");
74+
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 4", "PackageProject", "PackageProject.csproj");
7375
Project packageProject = Project.Load(packageProjectPath);
7476

7577
// Act
@@ -89,7 +91,7 @@ public void TryResolveProjectReferencesTest_DefaultProjectReferences_NothingSpec
8991
public void TryResolveProjectReferencesTest_SolutionFilter()
9092
{
9193
// Arrange
92-
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 5", "MyPackage", "MyPackage.csproj");
94+
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 5", "MyPackage", "MyPackage.csproj");
9395
Project packageProject = Project.Load(packageProjectPath);
9496

9597
// Act

SdkTests/SdkTests.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
1717
<PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.14" />
1818
<PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.1.0" />
19+
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.1.0" />
20+
<PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.1.1" />
1921
<PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="2.0.5" />
2022
<PackageReference Include="System.Text.Json" Version="9.0.1" />
2123
</ItemGroup>

0 commit comments

Comments
 (0)