Skip to content

Commit 00c3d2d

Browse files
lschoenepxclschoenepxc
committed
Switching to ubuntu for github actions
Deleting PowerShell Scripts !!Need to add LangVersion latest!!
1 parent b9ad51d commit 00c3d2d

13 files changed

+85
-854
lines changed

‎.build/BuildToolkit.ps1

-680
This file was deleted.

‎.build/Output.ps1

-36
This file was deleted.

‎.github/workflows/build-and-test.yml

+56-63
Original file line numberDiff line numberDiff line change
@@ -12,94 +12,87 @@ on:
1212
branches:
1313
- dev
1414
- future
15-
15+
1616
env:
17-
MORYX_OPTIMIZE_CODE: "false"
18-
MORYX_BUILD_CONFIG: "Release"
19-
MORYX_BUILDNUMBER: ${{github.run_number}}
2017
dotnet_sdk_version: '7.x'
21-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2218
REPOSITORY_NAME: ${{ github.event.repository.name }}
19+
MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx/api/v2/package'
20+
MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx/api/v3/index.json'
21+
MORYX_PACKAGE_TARGET_FUTURE: 'https://www.myget.org/F/moryx-future/api/v2/package'
22+
MORYX_PACKAGE_TARGET_V3_FUTURE: 'https://www.myget.org/F/moryx-future/api/v3/index.json'
23+
MORYX_PACKAGE_TARGET_RELEASE: 'https://api.nuget.org/v3/index.json'
24+
MORYX_PACKAGE_TARGET_V3_RELEASE: 'https://api.nuget.org/v3/index.json'
2325

2426
jobs:
27+
EnvVar:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- run: echo ""
31+
outputs:
32+
dotnet_sdk_version: ${{ env.dotnet_sdk_version }}
33+
REPOSITORY_NAME: ${{ env.REPOSITORY_NAME }}
34+
MORYX_PACKAGE_TARGET_DEV: ${{ env.MORYX_PACKAGE_TARGET_DEV }}
35+
MORYX_PACKAGE_TARGET_V3_DEV: ${{ env.MORYX_PACKAGE_TARGET_V3_DEV }}
36+
MORYX_PACKAGE_TARGET_FUTURE: ${{ env.MORYX_PACKAGE_TARGET_FUTURE }}
37+
MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ env.MORYX_PACKAGE_TARGET_V3_FUTURE }}
38+
MORYX_PACKAGE_TARGET_RELEASE: ${{ env.MORYX_PACKAGE_TARGET_RELEASE }}
39+
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ env.MORYX_PACKAGE_TARGET_V3_RELEASE }}
40+
2541
Build:
26-
uses: PHOENIXCONTACT/tools/.github/workflows/build-tool.yml@main
42+
needs: [EnvVar]
43+
uses: phoenixcontact/tools/.github/workflows/build-tool.yml@future
2744
with:
28-
MORYX_OPTIMIZE_CODE: "false"
29-
MORYX_BUILD_CONFIG: "Release"
30-
MORYX_BUILDNUMBER: ${{github.run_number}}
31-
dotnet_sdk_version: '7.x'
32-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
33-
REPOSITORY_NAME: ${{ github.event.repository.name }}
45+
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
46+
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
3447

3548
UnitTests:
36-
needs: [Build]
37-
uses: PHOENIXCONTACT/tools/.github/workflows/unittest-tool.yml@main
49+
needs: [EnvVar, Build]
50+
uses: phoenixcontact/tools/.github/workflows/unittest-tool.yml@future
3851
with:
39-
MORYX_OPTIMIZE_CODE: "false"
40-
MORYX_BUILD_CONFIG: "Release"
41-
MORYX_BUILDNUMBER: ${{github.run_number}}
42-
dotnet_sdk_version: '7.x'
43-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
44-
REPOSITORY_NAME: ${{ github.event.repository.name }}
52+
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
53+
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
4554

4655
IntegrationTests:
47-
needs: [Build]
48-
uses: PHOENIXCONTACT/tools/.github/workflows/integrationtest-tool.yml@main
56+
needs: [EnvVar, Build]
57+
uses: phoenixcontact/tools/.github/workflows/integrationtest-tool.yml@future
4958
with:
50-
MORYX_OPTIMIZE_CODE: "false"
51-
MORYX_BUILD_CONFIG: "Release"
52-
MORYX_BUILDNUMBER: ${{github.run_number}}
53-
dotnet_sdk_version: '7.x'
54-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
55-
REPOSITORY_NAME: ${{ github.event.repository.name }}
59+
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
60+
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
5661

5762
ReportGenerator:
58-
needs: [UnitTests, IntegrationTests]
59-
uses: PHOENIXCONTACT/tools/.github/workflows/reportgenerator-tool.yml@main
63+
needs: [EnvVar, UnitTests, IntegrationTests]
64+
uses: phoenixcontact/tools/.github/workflows/reportgenerator-tool.yml@future
6065
with:
61-
MORYX_OPTIMIZE_CODE: "false"
62-
MORYX_BUILD_CONFIG: "Release"
63-
MORYX_BUILDNUMBER: ${{github.run_number}}
64-
dotnet_sdk_version: '7.x'
65-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
66-
REPOSITORY_NAME: ${{ github.event.repository.name }}
66+
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
6767

6868
Publish-Test-Coverage:
69-
needs: [ReportGenerator]
70-
uses: PHOENIXCONTACT/tools/.github/workflows/publish-test-coverage-tool.yml@main
69+
needs: [EnvVar, ReportGenerator]
70+
uses: phoenixcontact/tools/.github/workflows/publish-test-coverage-tool.yml@future
7171
with:
72-
MORYX_OPTIMIZE_CODE: "false"
73-
MORYX_BUILD_CONFIG: "Release"
74-
MORYX_BUILDNUMBER: ${{github.run_number}}
75-
dotnet_sdk_version: '7.x'
76-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
77-
REPOSITORY_NAME: ${{ github.event.repository.name }}
72+
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
7873
secrets:
7974
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
8075
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
8176

82-
Documentation:
83-
needs: [UnitTests]
84-
uses: PHOENIXCONTACT/tools/.github/workflows/documentation-tool.yml@main
85-
with:
86-
MORYX_OPTIMIZE_CODE: "false"
87-
MORYX_BUILD_CONFIG: "Release"
88-
MORYX_BUILDNUMBER: ${{github.run_number}}
89-
dotnet_sdk_version: '7.x'
90-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
91-
REPOSITORY_NAME: ${{ github.event.repository.name }}
77+
# currently not working
78+
# Documentation:
79+
# needs: [EnvVar, UnitTests]
80+
# uses: phoenixcontact/tools/.github/workflows/documentation-tool.yml@future
81+
# with:
82+
# REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
9283

9384
Publish:
94-
needs: [UnitTests]
95-
uses: PHOENIXCONTACT/tools/.github/workflows/publish-tool.yml@main
85+
needs: [EnvVar, UnitTests]
86+
uses: phoenixcontact/tools/.github/workflows/publish-tool.yml@future
9687
with:
97-
MORYX_OPTIMIZE_CODE: "false"
98-
MORYX_BUILD_CONFIG: "Release"
99-
MORYX_BUILDNUMBER: ${{github.run_number}}
100-
dotnet_sdk_version: '7.x'
101-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
102-
REPOSITORY_NAME: ${{ github.event.repository.name }}
88+
dotnet_sdk_version: ${{ needs.EnvVar.outputs.dotnet_sdk_version }}
89+
REPOSITORY_NAME: ${{ needs.EnvVar.outputs.REPOSITORY_NAME }}
90+
MORYX_PACKAGE_TARGET_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_DEV }}
91+
MORYX_PACKAGE_TARGET_V3_DEV: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_DEV }}
92+
MORYX_PACKAGE_TARGET_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_FUTURE }}
93+
MORYX_PACKAGE_TARGET_V3_FUTURE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_FUTURE }}
94+
MORYX_PACKAGE_TARGET_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_RELEASE }}
95+
MORYX_PACKAGE_TARGET_V3_RELEASE: ${{ needs.EnvVar.outputs.MORYX_PACKAGE_TARGET_V3_RELEASE }}
10396
secrets:
10497
MYGET_TOKEN: ${{secrets.MYGET_TOKEN}}
105-
NUGET_TOKEN: ${{secrets.NUGET_TOKEN}}
98+
NUGET_TOKEN: ${{secrets.NUGET_TOKEN}}

‎Build.ps1

-63
This file was deleted.

‎Directory.build.props ‎Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<LangVersion>9.0</LangVersion>
3+
<LangVersion>latest</LangVersion>
44
</PropertyGroup>
55

66
<PropertyGroup>

‎Directory.Build.targets

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<dotnetVersion>6.0.0</dotnetVersion>
88
<efCoreVersion>6.0.0</efCoreVersion>
99

10+
<LangVersion>latest</LangVersion>
1011
</PropertyGroup>
1112

1213
<!-- Package refereces for all projects if CreatePackage=true -->

‎src/Tests/Directory.Build.props

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<IsPackable>false</IsPackable>
4+
</PropertyGroup>
5+
</Project>

‎src/Tests/Moryx.Communication.Sockets.IntegrationTests/CommunicationSocketsTests.cs

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
namespace Moryx.Communication.Sockets.IntegrationTests
1111
{
12+
// preprocessor statement for differentiating between different os
13+
// see: https://github.com/PHOENIXCONTACT/MORYX-Framework/issues/100 (Moryx-Framework/src/Moryx/Communication/Sockets/TcpTransmission.cs in line 85)
14+
#if _WINDOWS
1215
[TestFixture]
1316
public class CommunicationSocketsTests : CommunicationSocketsTestsBase<BinaryMessage<SystemTestHeader>>
1417
{
@@ -129,4 +132,5 @@ public void SendEmptyMessages()
129132
WaitForConnectionState(0, new TimeSpan(0, 0, 0, 1), BinaryConnectionState.AttemptingConnection);
130133
}
131134
}
135+
#endif
132136
}

‎src/Tests/Moryx.Communication.Sockets.IntegrationTests/CommunicationSocketsTestsBase.cs

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111

1212
namespace Moryx.Communication.Sockets.IntegrationTests
1313
{
14+
// preprocessor statement for differentiating between different os
15+
// see: https://github.com/PHOENIXCONTACT/MORYX-Framework/issues/100 (Moryx-Framework/src/Moryx/Communication/Sockets/TcpTransmission.cs in line 85)
16+
#if _WINDOWS
1417
public abstract class CommunicationSocketsTestsBase<TMessage> where TMessage : BinaryMessage
1518
{
1619
private List<ConnectionBuffer<TMessage>> _serverConnections;
@@ -340,4 +343,5 @@ protected static TcpListenerConfig CreateServerConfig(IPAddress adress, int port
340343
};
341344
}
342345
}
346+
#endif
343347
}

‎src/Tests/Moryx.Communication.Sockets.IntegrationTests/DelimiterProtocol/DelimiterCommunicationSocketTests.cs

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
namespace Moryx.Communication.Sockets.IntegrationTests.DelimiterProtocol
1010
{
11+
// preprocessor statement for differentiating between different os
12+
// see: https://github.com/PHOENIXCONTACT/MORYX-Framework/issues/100 (Moryx-Framework/src/Moryx/Communication/Sockets/TcpTransmission.cs in line 85)
13+
#if _WINDOWS
1114
[TestFixture]
1215
public class DelimiterCommunicationSocketTests : CommunicationSocketsTestsBase<BinaryMessage>
1316
{
@@ -66,4 +69,5 @@ public void SendDelimitedMessage()
6669
EndDelimiterOnlyInterpreter.TestEndDelimiter.Length, published.Payload.Length);
6770
}
6871
}
72+
#endif
6973
}

‎src/Tests/Moryx.Communication.Sockets.IntegrationTests/HeaderProtocol/HeaderedCommunicationSocketTests.cs

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010

1111
namespace Moryx.Communication.Sockets.IntegrationTests
1212
{
13+
// preprocessor statement for differentiating between different os
14+
// see: https://github.com/PHOENIXCONTACT/MORYX-Framework/issues/100 (Moryx-Framework/src/Moryx/Communication/Sockets/TcpTransmission.cs in line 85)
15+
#if _WINDOWS
1316
[TestFixture]
1417
public class HeaderedCommunicationSocketTests : CommunicationSocketsTestsBase<BinaryMessage<SystemTestHeader>>
1518
{
@@ -299,4 +302,5 @@ protected override BinaryMessage CreateMessage(int senderId, byte[] payload)
299302
return new BinaryMessage<SystemTestHeader>(header, payload);
300303
}
301304
}
305+
#endif
302306
}

‎src/Tests/Moryx.Communication.Sockets.IntegrationTests/Moryx.Communication.Sockets.IntegrationTests.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<DebugType>full</DebugType>
77
</PropertyGroup>
88

9+
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
10+
<DefineConstants>_WINDOWS</DefineConstants>
11+
</PropertyGroup>
12+
913
<ItemGroup>
1014
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1115
<PackageReference Include="Moq" />

‎src/Tests/Moryx.Model.Tests/SqliteTests.cs

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
using Microsoft.Extensions.Logging;
2-
using Moryx.Model.InMemory;
3-
using Moryx.Model.Sqlite;
1+
using Moryx.Model.Sqlite;
42
using Moryx.Products.Model;
5-
using Moryx.Runtime.Endpoints.Databases.Endpoint.Services;
63
using Moryx.Runtime.Kernel;
7-
using Moryx.TestTools.Test.Model;
84
using NUnit.Framework;
9-
using System;
10-
using System.Collections.Generic;
115
using System.IO;
12-
using System.Linq;
13-
using System.Text;
146
using System.Threading.Tasks;
157

168
namespace Moryx.Model.Tests
@@ -26,7 +18,7 @@ public class SqliteTests
2618
public void Setup()
2719
{
2820
string databaseName = "TestDatabase";
29-
datasource = $".\\db\\{databaseName}.db";
21+
datasource = Path.Combine(".", "db", databaseName+".db");
3022
string connectionString = $@"Data Source={datasource};";
3123
dbConfig = new SqliteDatabaseConfig();
3224
dbConfig.ConnectionSettings = new DatabaseConnectionSettings { ConnectionString = connectionString, Database = databaseName };
@@ -80,6 +72,5 @@ public void Destroy()
8072
configurator.DeleteDatabase(dbConfig).Wait();
8173

8274
}
83-
8475
}
8576
}

0 commit comments

Comments
 (0)