Skip to content

Commit

Permalink
Removing some of the clunkiness with instantiating datastores (#246)
Browse files Browse the repository at this point in the history
* Upgrade to support .NET 9 and remove support for .NET 6 & 7

Signed-off-by: Martin Pekurny <mpekurny@paychex.com>

* Fixed AssemblyLoader unit tests, load step registry before starting service, and reorg loader and refacroring classes

Signed-off-by: Martin Pekurny <mpekurny@paychex.com>

* Removing some of the clunkiness with setting DataStores

Signed-off-by: Martin Pekurny <mpekurny@paychex.com>

* Update integration tests projects with lib build 0.12.0 from nuget and rebuild them

Signed-off-by: Martin Pekurny <mpekurny@paychex.com>

---------

Signed-off-by: Martin Pekurny <mpekurny@paychex.com>
  • Loading branch information
mpekurny authored Nov 28, 2024
1 parent 75da372 commit a35b0bb
Show file tree
Hide file tree
Showing 120 changed files with 1,422 additions and 4,393 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Dotnet unit test on windows
if: matrix.os == 'windows-latest'
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- uses: getgauge/setup-gauge@master
with:
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- uses: getgauge/setup-gauge@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-on-pr-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x

- name: Setup git
run: |
Expand Down
2 changes: 1 addition & 1 deletion _testdata/ReferenceDllProject/ReferenceDll.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Gauge.CSharp.Lib" Version="0.11.3" />
<PackageReference Include="Gauge.CSharp.Lib" Version="0.12.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion _testdata/ReferenceProject/ReferenceProject.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.2" />
<PackageReference Include="Gauge.CSharp.Lib" Version="0.11.3" />
<PackageReference Include="Gauge.CSharp.Lib" Version="0.12.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion _testdata/Sample/IntegrationTestSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Gauge.CSharp.Lib" Version="0.11.3" />
<PackageReference Include="Gauge.CSharp.Lib" Version="0.12.0" />
</ItemGroup>
</Project>
Binary file modified _testdata/Sample/gauge_bin/Gauge.CSharp.Lib.dll
Binary file not shown.
16 changes: 8 additions & 8 deletions _testdata/Sample/gauge_bin/IntegrationTestSample.deps.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
".NETCoreApp,Version=v8.0": {
"IntegrationTestSample/1.0.0": {
"dependencies": {
"Gauge.CSharp.Lib": "0.11.1"
"Gauge.CSharp.Lib": "0.12.0"
},
"runtime": {
"IntegrationTestSample.dll": {}
}
},
"Gauge.CSharp.Lib/0.11.1": {
"Gauge.CSharp.Lib/0.12.0": {
"runtime": {
"lib/net8.0/Gauge.CSharp.Lib.dll": {
"assemblyVersion": "0.11.1.0",
"fileVersion": "0.11.1.0"
"assemblyVersion": "0.12.0.0",
"fileVersion": "0.12.0.0"
}
}
}
Expand All @@ -30,12 +30,12 @@
"serviceable": false,
"sha512": ""
},
"Gauge.CSharp.Lib/0.11.1": {
"Gauge.CSharp.Lib/0.12.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-QEgfnNnhgPkW+BuXcz4bKN4DsjFWEepIN7gcIs68/STVlejB6LaMYDmrDFdakSVV6G21xWz4U8egSurZsN4RaA==",
"path": "gauge.csharp.lib/0.11.1",
"hashPath": "gauge.csharp.lib.0.11.1.nupkg.sha512"
"sha512": "sha512-C3bYsHzxJznZ9ZLIkiZ8SjoukTkIwG55Ra0Yo9uGl1ynyvHJeVPYQSLkAd6ogPqJl905BFSrQqt6uII0g4vU3g==",
"path": "gauge.csharp.lib/0.12.0",
"hashPath": "gauge.csharp.lib.0.12.0.nupkg.sha512"
}
}
}
Binary file modified _testdata/Sample/gauge_bin/IntegrationTestSample.dll
Binary file not shown.
Binary file modified _testdata/Sample/gauge_bin/IntegrationTestSample.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Gauge.CSharp.Lib" Version="0.11.3" />
<PackageReference Include="Gauge.CSharp.Lib" Version="0.12.0" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 2 additions & 8 deletions _testdata/SampleDllReference/StepImplementation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@

using System;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
using Gauge.CSharp.Lib;
using Gauge.CSharp.Lib.Attribute;
Expand Down Expand Up @@ -79,7 +77,8 @@ public void ReadTable(Table table)
}

[Step("Take Screenshot in reference DLL")]
public void TakeDllReferenceScreenshot() {
public void TakeDllReferenceScreenshot()
{
GaugeScreenshots.RegisterCustomScreenshotWriter(new ReferenceDll.ScreenshotWriter());
GaugeScreenshots.Capture();
GaugeScreenshots.RegisterCustomScreenshotWriter(new StringScreenshotWriter());
Expand All @@ -91,11 +90,6 @@ public class CustomSerializableException : Exception
public CustomSerializableException(string s) : base(s)
{
}

public CustomSerializableException(SerializationInfo info, StreamingContext context)
: base(info, context)
{
}
}

public class CustomException : Exception
Expand Down
Binary file not shown.
Binary file modified _testdata/SampleDllReference/gauge_bin/FluentAssertions.dll
Binary file not shown.
Binary file modified _testdata/SampleDllReference/gauge_bin/Gauge.CSharp.Lib.dll
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@
".NETCoreApp,Version=v8.0": {
"IntegrationTestSampleDllReference/1.0.0": {
"dependencies": {
"Gauge.CSharp.Lib": "0.11.1",
"Gauge.CSharp.Lib": "0.12.0",
"ReferenceDll": "1.0.0.0"
},
"runtime": {
"IntegrationTestSampleDllReference.dll": {}
}
},
"Gauge.CSharp.Lib/0.11.1": {
"Gauge.CSharp.Lib/0.12.0": {
"runtime": {
"lib/net8.0/Gauge.CSharp.Lib.dll": {
"assemblyVersion": "0.11.1.0",
"fileVersion": "0.11.1.0"
"assemblyVersion": "0.12.0.0",
"fileVersion": "0.12.0.0"
}
}
},
Expand All @@ -31,19 +31,27 @@
}
}
},
"FluentAssertions/4.19.4.0": {
"FluentAssertions/6.12.2.0": {
"runtime": {
"FluentAssertions.dll": {
"assemblyVersion": "4.19.4.0",
"fileVersion": "4.19.4.0"
"assemblyVersion": "6.12.2.0",
"fileVersion": "6.12.2.0"
}
}
},
"FluentAssertions.Core/4.19.4.0": {
"System.Configuration.ConfigurationManager/4.0.0.0": {
"runtime": {
"FluentAssertions.Core.dll": {
"assemblyVersion": "4.19.4.0",
"fileVersion": "4.19.4.0"
"System.Configuration.ConfigurationManager.dll": {
"assemblyVersion": "4.0.0.0",
"fileVersion": "4.6.25519.3"
}
}
},
"System.Security.Cryptography.ProtectedData/4.0.2.0": {
"runtime": {
"System.Security.Cryptography.ProtectedData.dll": {
"assemblyVersion": "4.0.2.0",
"fileVersion": "4.6.25519.3"
}
}
}
Expand All @@ -55,24 +63,29 @@
"serviceable": false,
"sha512": ""
},
"Gauge.CSharp.Lib/0.11.1": {
"Gauge.CSharp.Lib/0.12.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-QEgfnNnhgPkW+BuXcz4bKN4DsjFWEepIN7gcIs68/STVlejB6LaMYDmrDFdakSVV6G21xWz4U8egSurZsN4RaA==",
"path": "gauge.csharp.lib/0.11.1",
"hashPath": "gauge.csharp.lib.0.11.1.nupkg.sha512"
"sha512": "sha512-C3bYsHzxJznZ9ZLIkiZ8SjoukTkIwG55Ra0Yo9uGl1ynyvHJeVPYQSLkAd6ogPqJl905BFSrQqt6uII0g4vU3g==",
"path": "gauge.csharp.lib/0.12.0",
"hashPath": "gauge.csharp.lib.0.12.0.nupkg.sha512"
},
"ReferenceDll/1.0.0.0": {
"type": "reference",
"serviceable": false,
"sha512": ""
},
"FluentAssertions/4.19.4.0": {
"FluentAssertions/6.12.2.0": {
"type": "reference",
"serviceable": false,
"sha512": ""
},
"System.Configuration.ConfigurationManager/4.0.0.0": {
"type": "reference",
"serviceable": false,
"sha512": ""
},
"FluentAssertions.Core/4.19.4.0": {
"System.Security.Cryptography.ProtectedData/4.0.2.0": {
"type": "reference",
"serviceable": false,
"sha512": ""
Expand Down
Binary file not shown.
Binary file not shown.
Binary file modified _testdata/SampleDllReference/gauge_bin/ReferenceDll.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified _testdata/SampleDllReference/libs/FluentAssertions.dll
Binary file not shown.
Binary file modified _testdata/SampleDllReference/libs/Gauge.CSharp.Lib.dll
Binary file not shown.
Loading

0 comments on commit a35b0bb

Please sign in to comment.