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

Improve robustness for Ubuntu #6

Merged
merged 1 commit into from
Feb 19, 2025
Merged

Improve robustness for Ubuntu #6

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
9 changes: 9 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,12 @@ jobs:
pfx: ${{ secrets.PFX }}
pfxPassword: ${{ secrets.PFXPASSWORD }}
nugetApiKey: ${{ secrets.NUGETAPIKEY }}

Tests-Ubuntu:
runs-on: ubuntu-22.04 # Latest misses mono for .NET Framework

steps:
- uses: actions/checkout@v4

- name: Test
run: dotnet test -c Release
2 changes: 2 additions & 0 deletions Sdk/Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ By integrating this SDK into your build process, you can easily generate install
<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
<PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.14" />
<PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.1.0" />
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.1.0" />
<PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.1.1" />
<PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="2.0.5" />
<PackageReference Include="System.Text.Json" Version="9.0.1" />
</ItemGroup>
Expand Down
12 changes: 7 additions & 5 deletions SdkTests/Helpers/ProjectReferencesHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
namespace SdkTests.Helpers
{
using FluentAssertions;

using Skyline.DataMiner.CICD.FileSystem;
using Skyline.DataMiner.CICD.Parsers.Common.VisualStudio.Projects;
using Skyline.DataMiner.Sdk.Helpers;

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

// Act
Expand All @@ -31,7 +33,7 @@ public void TryResolveProjectReferencesTest_DefaultProjectReferences()
public void TryResolveProjectReferencesTest_ExcludeScript()
{
// Arrange
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 2", "PackageProject", "PackageProject.csproj");
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 2", "PackageProject", "PackageProject.csproj");
Project packageProject = Project.Load(packageProjectPath);

// Act
Expand All @@ -50,7 +52,7 @@ public void TryResolveProjectReferencesTest_ExcludeScript()
public void TryResolveProjectReferencesTest_PackageProjectOnly()
{
// Arrange
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 3", "MyPackage", "MyPackage.csproj");
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 3", "MyPackage", "MyPackage.csproj");
Project packageProject = Project.Load(packageProjectPath);

// Act
Expand All @@ -69,7 +71,7 @@ public void TryResolveProjectReferencesTest_PackageProjectOnly()
public void TryResolveProjectReferencesTest_DefaultProjectReferences_NothingSpecifiedInFile()
{
// Arrange
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 4", "PackageProject", "PackageProject.csproj");
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 4", "PackageProject", "PackageProject.csproj");
Project packageProject = Project.Load(packageProjectPath);

// Act
Expand All @@ -89,7 +91,7 @@ public void TryResolveProjectReferencesTest_DefaultProjectReferences_NothingSpec
public void TryResolveProjectReferencesTest_SolutionFilter()
{
// Arrange
string packageProjectPath = Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 5", "MyPackage", "MyPackage.csproj");
string packageProjectPath = FileSystem.Instance.Path.Combine(TestHelper.GetTestFilesDirectory(), "Package 5", "MyPackage", "MyPackage.csproj");
Project packageProject = Project.Load(packageProjectPath);

// Act
Expand Down
2 changes: 2 additions & 0 deletions SdkTests/SdkTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<PackageReference Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
<PackageReference Include="Skyline.DataMiner.CICD.DMApp.Common" Version="2.0.14" />
<PackageReference Include="Skyline.DataMiner.CICD.Assemblers.Automation" Version="1.1.0" />
<PackageReference Include="Skyline.DataMiner.CICD.FileSystem" Version="1.1.0" />
<PackageReference Include="Skyline.DataMiner.CICD.Parsers.Common" Version="1.1.1" />
<PackageReference Include="Skyline.DataMiner.Core.AppPackageCreator" Version="2.0.5" />
<PackageReference Include="System.Text.Json" Version="9.0.1" />
</ItemGroup>
Expand Down