Skip to content

Commit 1d0e589

Browse files
pvshnpvshn
authored
Merge pull request #31 from tableau/package-updates
Update Migration SDK Version to 6.0.0 and make other package updates
2 parents cf8aa94 + 2e9327a commit 1d0e589

6 files changed

Lines changed: 43 additions & 40 deletions

File tree

‎src/Tableau.Migration.App.Core/Tableau.Migration.App.Core.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
30+
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
<PrivateAssets>all</PrivateAssets>
3333
</PackageReference>
34-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
35-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
36-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
34+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
35+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.3" />
36+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.3" />
3737
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>
4040
</PackageReference>
4141
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
42-
<PackageReference Include="Tableau.Migration" Version="5.1.*" />
42+
<PackageReference Include="Tableau.Migration" Version="6.0.0" />
4343
</ItemGroup>
4444

4545
<ItemGroup>

‎src/Tableau.Migration.App.GUI/Tableau.Migration.App.GUI.csproj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Avalonia" Version="11.1.0" />
28-
<PackageReference Include="Avalonia.Desktop" Version="11.1.0" />
29-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0" />
30-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0" />
27+
<PackageReference Include="Avalonia" Version="11.3.12" />
28+
<PackageReference Include="Avalonia.Desktop" Version="11.3.12" />
29+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
30+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.12" />
3131
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
32-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0" />
33-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
34-
<PackageReference Include="CsvHelper" Version="33.0.1" />
35-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*" />
36-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
37-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
38-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
39-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
32+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.12" />
33+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
34+
<PackageReference Include="CsvHelper" Version="33.1.0" />
35+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
36+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
37+
<PackageReference Include="Serilog.Extensions.Logging" Version="10.0.0" />
38+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
39+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
4040
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
4141
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4242
<PrivateAssets>all</PrivateAssets>
4343
</PackageReference>
44-
<PackageReference Include="System.Reactive" Version="6.0.1" />
44+
<PackageReference Include="System.Reactive" Version="6.1.0" />
4545
</ItemGroup>
4646

4747
<ItemGroup>

‎tests/Tableau.Migration.App.Core.Tests/Entities/AppSettings.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ namespace AppSettingsTests;
2121
using Microsoft.Extensions.Logging;
2222
using Moq;
2323
using System.Threading;
24+
using System.Threading.Tasks;
2425
using Tableau.Migration;
2526
using Tableau.Migration.App.Core.Entities;
2627
using Tableau.Migration.App.Core.Hooks.Mappings;
@@ -33,7 +34,7 @@ namespace AppSettingsTests;
3334
public class AppSettingsTest
3435
{
3536
[Fact]
36-
public async void AppSettings_UseSimulator_True()
37+
public async Task AppSettings_UseSimulator_True()
3738
{
3839
var services = new ServiceCollection();
3940
var appSettings = new AppSettings();
@@ -61,7 +62,7 @@ public async void AppSettings_UseSimulator_True()
6162
}
6263

6364
[Fact(Skip = "Skipped since SDK Retries will make this test take several minutes to complete.")]
64-
public async void AppSettings_UseSimulator_False()
65+
public async Task AppSettings_UseSimulator_False()
6566
{
6667
var services = new ServiceCollection();
6768
services.AddLogging(configure => configure.AddConsole());

‎tests/Tableau.Migration.App.Core.Tests/Service/TableauMigrationService.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,20 @@ public TableauMigrationServiceTests()
6868
It.IsAny<string>(),
6969
It.IsAny<string>(),
7070
It.IsAny<string>(),
71-
It.IsAny<bool>())).Returns(
72-
(Uri url, string site, string tokenName, string token, bool useSim)
73-
=> planBuilder.FromSourceTableauServer(url, site, tokenName, token, true));
71+
It.IsAny<bool>(),
72+
It.IsAny<string>())).Returns(
73+
(Uri url, string site, string tokenName, string token, bool useSim, string? contentUrl)
74+
=> planBuilder.FromSourceTableauServer(url, site, tokenName, token, true, contentUrl ?? string.Empty));
7475
this.mockPlanBuilder.Setup(
7576
pb => pb.ToDestinationTableauCloud(
7677
It.IsAny<Uri>(),
7778
It.IsAny<string>(),
7879
It.IsAny<string>(),
7980
It.IsAny<string>(),
80-
It.IsAny<bool>())).Returns(
81-
(Uri url, string site, string tokenName, string token, bool useSim)
82-
=> planBuilder.ToDestinationTableauCloud(url, site, tokenName, token, true));
81+
It.IsAny<bool>(),
82+
It.IsAny<string>())).Returns(
83+
(Uri url, string site, string tokenName, string token, bool useSim, string? contentUrl)
84+
=> planBuilder.ToDestinationTableauCloud(url, site, tokenName, token, true, contentUrl ?? string.Empty));
8385
this.mockMigrator = new Mock<IMigrator>();
8486
this.mockLogger = new Mock<ILogger<TableauMigrationService>>();
8587
this.mockProgressUpdater = new Mock<IProgressUpdater>();

‎tests/Tableau.Migration.App.Core.Tests/Tableau.Migration.App.Core.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
12+
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
<PrivateAssets>all</PrivateAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
16+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.3" />
17+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1919
<PackageReference Include="Moq" Version="4.20.72" />
20-
<PackageReference Include="xunit" Version="2.4.2" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
20+
<PackageReference Include="xunit" Version="2.9.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="coverlet.collector" Version="6.0.0">
25+
<PackageReference Include="coverlet.collector" Version="8.0.0">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>

‎tests/Tableau.Migration.App.GUI.Tests/Tableau.Migration.App.GUI.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Avalonia.Headless.XUnit" Version="11.2.0" />
13-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
14-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
12+
<PackageReference Include="Avalonia.Headless.XUnit" Version="11.3.12" />
13+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.12" />
14+
<PackageReference Include="coverlet.msbuild" Version="8.0.0">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1919
<PackageReference Include="Moq" Version="4.20.72" />
20-
<PackageReference Include="xunit" Version="2.4.2" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
20+
<PackageReference Include="xunit" Version="2.9.3" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>
25-
<PackageReference Include="coverlet.collector" Version="6.0.0">
25+
<PackageReference Include="coverlet.collector" Version="8.0.0">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>
2828
</PackageReference>

0 commit comments

Comments
 (0)