Skip to content

Commit c5f55ab

Browse files
andreas-valtechandreas-valtech
committed
Upgrade to .NET 10
- Update to use .NET 10 - Update all packages - Remove excessive logging
1 parent fd9f219 commit c5f55ab

File tree

6 files changed

+37
-22
lines changed

6 files changed

+37
-22
lines changed

‎src/Optimizely.TestContainers.Commerce.Tests/Optimizely.TestContainers.Commerce.Tests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -20,13 +20,13 @@
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>
23-
<PackageReference Include="EPiServer.CMS" Version="12.33.1" />
24-
<PackageReference Include="EPiServer.Commerce" Version="14.40.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
23+
<PackageReference Include="EPiServer.CMS" Version="12.34.1" />
24+
<PackageReference Include="EPiServer.Commerce" Version="14.44.1" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2626
<PackageReference Include="Moq" Version="4.17.2" />
27-
<PackageReference Include="Testcontainers.MsSql" Version="4.6.0" />
27+
<PackageReference Include="Testcontainers.MsSql" Version="4.9.0" />
2828
<PackageReference Include="xunit" Version="2.9.3" />
29-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
29+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
3030
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3131
<PrivateAssets>all</PrivateAssets>
3232
</PackageReference>

‎src/Optimizely.TestContainers.Shared/Optimizely.TestContainers.Shared.csproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -16,10 +16,12 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="EPiServer.CMS" Version="12.33.1" />
20-
<PackageReference Include="Testcontainers.MsSql" Version="4.6.0" />
19+
<PackageReference Include="EPiServer.CMS" Version="12.34.1" />
20+
<PackageReference Include="EPiServer.ImageLibrary.ImageSharp" Version="2.0.5" />
21+
<PackageReference Include="Testcontainers.MsSql" Version="4.9.0" />
2122
<PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
22-
<PackageReference Include="Microsoft.SqlServer.DacFx" Version="170.2.70" />
23+
<PackageReference Include="MimeKit" Version="4.14.0" />
24+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
2325
</ItemGroup>
2426

2527
</Project>

‎src/OptimizelyTestContainers.Tests/MediaIntegrationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public void ImageFile_Properties_Should_Persist_After_Save()
270270
Assert.Equal(expectedCopyright, loaded.Copyright);
271271
}
272272

273-
[Fact(Skip = "Fails due to known issue with VideoFile PreviewImage not persisting correctly.")]
273+
[Fact]
274274
public void VideoFile_PreviewImage_Should_Persist_After_Save()
275275
{
276276
// Arrange

‎src/OptimizelyTestContainers.Tests/NewsPageNegativeTests.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,15 @@ public void Cannot_Get_Wrong_Content_Type()
268268
var basePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!;
269269
var episerverDataFile = Path.Combine(basePath, "DefaultSiteContent.episerverdata");
270270
var dataImporter = Services.GetRequiredService<OptimizelyDataImporter>();
271+
/* TODO:
272+
OptimizelyTestContainers.Tests.NewsPageNegativeTests.Cannot_Save_NewsPage_Without_Name (10s 443ms): Error Message:
273+
System.Exception : Failed to Deserialize object to Dynamic Data Store. BinaryFormatter serialization and deserial
274+
ization have been removed. See https://aka.ms/binaryformatter for more information.
275+
Stack Trace:
276+
at OptimizelyTestContainers.Tests.OptimizelyDataImporter.Import(String importFilePath) in D:\Git\Valtech\Optimi
277+
zelyTestContainers\src\OptimizelyTestContainers.Tests\OptimizelyDataImporter.cs:line 35
278+
279+
*/
271280
dataImporter.Import(episerverDataFile);
272281

273282
var startPage = repo.GetChildren<StartPage>(ContentReference.RootPage).First();

‎src/OptimizelyTestContainers.Tests/OptimizelyDataImporter.cs‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ public class OptimizelyDataImporter(ILogger<OptimizelyDataImporter> logger, IDat
99
{
1010
public void Import(string importFilePath)
1111
{
12+
/*
1213
contentEvents.PublishedContent += (s, e) =>
1314
{
1415
logger.LogInformation("Published: {ContentName}", e.Content.Name);
15-
};
16+
};*/
1617

1718
using var stream = File.OpenRead(importFilePath);
1819

@@ -28,22 +29,25 @@ public void Import(string importFilePath)
2829
var importLog = dataImporter.Import(stream, ContentReference.RootPage, options);
2930

3031
var errors = importLog.Errors.ToList();
31-
var warnings = importLog.Warnings.ToList();
32+
3233

33-
if (errors.Count != 0)
34+
if (errors.Count > 0)
3435
{
35-
throw new Exception(errors.First());
36+
throw new AggregateException(errors.Select(err => new Exception(err)));
3637
}
3738

39+
/*
40+
41+
var warnings = importLog.Warnings.ToList();
3842
if (warnings.Count == 0)
3943
{
4044
return;
4145
}
42-
46+
4347
foreach (var warning in warnings)
4448
{
4549
logger.LogWarning(warning);
4650
Console.WriteLine(warning);
47-
}
51+
}*/
4852
}
4953
}

‎src/OptimizelyTestContainers.Tests/OptimizelyTestContainers.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -20,12 +20,12 @@
2020
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2121
<PrivateAssets>all</PrivateAssets>
2222
</PackageReference>
23-
<PackageReference Include="EPiServer.CMS" Version="12.33.1" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
23+
<PackageReference Include="EPiServer.CMS" Version="12.34.1" />
24+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2525
<PackageReference Include="Moq" Version="4.17.2" />
26-
<PackageReference Include="Testcontainers.MsSql" Version="4.6.0" />
26+
<PackageReference Include="Testcontainers.MsSql" Version="4.9.0" />
2727
<PackageReference Include="xunit" Version="2.9.3" />
28-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
28+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
<PrivateAssets>all</PrivateAssets>
3131
</PackageReference>

0 commit comments

Comments
 (0)