Skip to content

Commit 3da3306

Browse files
ChrisPulmanChrisPulman
authored
Merge pull request #176 from reactivemarbles/UpdateBuild
Update dependencies and target frameworks across projects
2 parents e5f3adb + 70a7bc5 commit 3da3306

File tree

10 files changed

+35
-49
lines changed

10 files changed

+35
-49
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<!-- Include PDB in the built .nupkg -->
3131
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
3232
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
33-
<CoreVersion>10.0.0-rc.2.25502.107</CoreVersion>
33+
<CoreVersion>10.0.0</CoreVersion>
3434
</PropertyGroup>
3535

3636
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎build/_build.csproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>$(NoWarn);CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
88
<IsPackable>false</IsPackable>
@@ -12,16 +12,13 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="CP.Nuke.BuildTools" Version="1.0.94" />
16-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" />
17-
<PackageReference Include="Nuke.Common" Version="9.0.4" />
18-
<PackageReference Include="Microsoft.Build" Version="17.11.48" />
19-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" />
20-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.11.48" />
15+
<PackageReference Include="CP.Nuke.BuildTools" Version="2.0.16" />
16+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" />
17+
<PackageReference Include="Nuke.Common" Version="10.0.0" />
2118
</ItemGroup>
2219

2320
<ItemGroup>
24-
<PackageDownload Include="nbgv" Version="[3.8.118]" />
21+
<PackageDownload Include="nbgv" Version="[3.9.50]" />
2522
</ItemGroup>
2623

2724
</Project>

‎src/Extensions.Hosting.Identity.EntityFrameworkCore.Sqlite/Extensions.Hosting.Identity.EntityFrameworkCore.Sqlite.csproj‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,9 @@
77
<PackageId>CP.Extensions.Hosting.Identity.EntityFrameworkCore.Sqlite</PackageId>
88
</PropertyGroup>
99

10-
<!-- Use framework-appropriate package versions -->
11-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10')) ">
10+
<ItemGroup>
1211
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(CoreVersion)" />
1312
</ItemGroup>
14-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net9')) ">
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
16-
</ItemGroup>
17-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net8')) ">
18-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.16" />
19-
</ItemGroup>
2013

2114
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10')) ">
2215
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="$(CoreVersion)" />
@@ -27,25 +20,25 @@
2720
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2821
</PackageReference>
2922
<!-- Align MSBuild dependencies to avoid NU1605 downgrades from transitive EF tooling -->
30-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" PrivateAssets="all" />
31-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.8" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" PrivateAssets="all" />
24+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" PrivateAssets="all" />
3225
</ItemGroup>
3326

3427
<ItemGroup Condition=" $(TargetFramework.StartsWith('net9')) ">
35-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.10" />
36-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
37-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
38-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
28+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.11" />
29+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.11" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.11" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.11">
3932
<PrivateAssets>all</PrivateAssets>
4033
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4134
</PackageReference>
4235
</ItemGroup>
4336

4437
<ItemGroup Condition=" $(TargetFramework.StartsWith('net8')) ">
45-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.16" />
46-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.16" />
47-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.16" />
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.16">
38+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.22" />
39+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.22" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.22" />
41+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.22">
4942
<PrivateAssets>all</PrivateAssets>
5043
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5144
</PackageReference>

‎src/Extensions.Hosting.Identity.EntityFrameworkCore/Extensions.Hosting.Identity.EntityFrameworkCore.SqlServer.csproj‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(CoreVersion)" />
12-
<PackageReference Include="System.Formats.Asn1" Version="$(CoreVersion)" />
1312
</ItemGroup>
1413

1514
<ItemGroup Condition=" $(TargetFramework.StartsWith('net10')) ">
@@ -21,25 +20,25 @@
2120
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2221
</PackageReference>
2322
<!-- Align MSBuild dependencies to avoid NU1605 downgrades from transitive EF tooling -->
24-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.8" PrivateAssets="all" />
25-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.14.8" PrivateAssets="all" />
23+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.0.2" PrivateAssets="all" />
24+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" PrivateAssets="all" />
2625
</ItemGroup>
2726

2827
<ItemGroup Condition=" $(TargetFramework.StartsWith('net9')) ">
29-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.10" />
30-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.10" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
28+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.11" />
29+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.11" />
30+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.11" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.11">
3332
<PrivateAssets>all</PrivateAssets>
3433
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3534
</PackageReference>
3635
</ItemGroup>
3736

3837
<ItemGroup Condition=" $(TargetFramework.StartsWith('net8')) ">
39-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.16" />
40-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.16" />
41-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.16" />
42-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.16">
38+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="8.0.22" />
39+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.22" />
40+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22" />
41+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.22">
4342
<PrivateAssets>all</PrivateAssets>
4443
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4544
</PackageReference>

‎src/Extensions.Hosting.Reactive.Example/Extensions.Hosting.Reactive.Example.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="NuGet.Protocol" Version="6.14.0" />
17+
<PackageReference Include="NuGet.Protocol" Version="7.0.1" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(CoreVersion)" />
1919
</ItemGroup>
2020

‎src/Extensions.Hosting.ReactiveUI.WinForms/Extensions.Hosting.ReactiveUI.WinForms.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<ItemGroup>
1313
<PackageReference Include="Splat" Version="17.1.1" />
1414
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="17.1.1" />
15-
<PackageReference Include="ReactiveUI.Drawing" Version="22.2.1" />
16-
<PackageReference Include="ReactiveUI.WinForms" Version="22.2.1" />
15+
<PackageReference Include="ReactiveUI.Drawing" Version="22.3.1" />
16+
<PackageReference Include="ReactiveUI.WinForms" Version="22.3.1" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/Extensions.Hosting.ReactiveUI.WinUI/Extensions.Hosting.ReactiveUI.WinUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Splat" Version="17.1.1" />
1616
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="17.1.1" />
17-
<PackageReference Include="ReactiveUI.WinUI" Version="22.2.1" />
17+
<PackageReference Include="ReactiveUI.WinUI" Version="22.3.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Extensions.Hosting.ReactiveUI.WinUI/HostBuilderReactiveUiExtensions.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@ public static IHostBuilder ConfigureSplatForMicrosoftDependencyResolver(this IHo
3636
/// <returns>The same IHostApplicationBuilder instance.</returns>
3737
public static IHostApplicationBuilder ConfigureSplatForMicrosoftDependencyResolver(this IHostApplicationBuilder hostBuilder)
3838
{
39-
if (hostBuilder == null)
40-
{
41-
throw new ArgumentNullException(nameof(hostBuilder));
42-
}
39+
ArgumentNullException.ThrowIfNull(hostBuilder);
4340

4441
hostBuilder.Services.UseMicrosoftDependencyResolver();
4542
AppLocator.CurrentMutable.CreateReactiveUIBuilder()

‎src/Extensions.Hosting.ReactiveUI.Wpf/Extensions.Hosting.ReactiveUI.Wpf.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<ItemGroup>
1313
<PackageReference Include="Splat" Version="17.1.1" />
1414
<PackageReference Include="Splat.Microsoft.Extensions.DependencyInjection" Version="17.1.1" />
15-
<PackageReference Include="ReactiveUI.Drawing" Version="22.2.1" />
16-
<PackageReference Include="ReactiveUI.WPF" Version="22.2.1" />
15+
<PackageReference Include="ReactiveUI.Drawing" Version="22.3.1" />
16+
<PackageReference Include="ReactiveUI.WPF" Version="22.3.1" />
1717
</ItemGroup>
1818

1919
<ItemGroup>

‎src/Extensions.Hosting.WinUI/Extensions.Hosting.WinUI.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251003001" />
14+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

0 commit comments

Comments
 (0)