Skip to content

Commit 160cea6

Browse files
rockfordlhotkaStefanOssendorfBowman74
authored
Update to .NET 10.0.0 (#4763)
* #4347 Update to .NET 10.0.0 * Update gloab.json to use net10 release sdk Use .Net 10 release sdk version as minimum sdk version * #4763 Change to project file to update the MAUI references to releaseed versions and to update nuget.org Csla package reference to latest beta. --------- Co-authored-by: Stefan Ossendorf <stefan.ossendorf@googlemail.com> Co-authored-by: Kevin E. Ford <4380198+Bowman74@users.noreply.github.com>
1 parent d28dc8d commit 160cea6

File tree

13 files changed

+45
-43
lines changed

13 files changed

+45
-43
lines changed

‎Source/Csla.AspNetCore/Csla.AspNetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
2020
<FrameworkReference Include="Microsoft.AspNetCore.App" />
21-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0-rc.2.25502.107" />
21+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0" />
2222
</ItemGroup>
2323
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
2424
<FrameworkReference Include="Microsoft.AspNetCore.App" />

‎Source/Csla.Blazor.WebAssembly/Csla.Blazor.WebAssembly.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="System.Net.Http.Json" Version="10.0.0-rc.2.25502.107" />
24+
<PackageReference Include="System.Net.Http.Json" Version="10.0.0" />
2525
</ItemGroup>
2626
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
27-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0-rc.2.25502.107" />
27+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
2828
</ItemGroup>
2929
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
3030
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />

‎Source/Csla.Blazor/Csla.Blazor.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</ItemGroup>
2323

2424
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
25-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="10.0.0-rc.2.25502.107" />
26-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-rc.2.25502.107" />
27-
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0-rc.2.25502.107" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="10.0.0" />
26+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
27+
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.0" />
2828
</ItemGroup>
2929
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
3030
<PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.0" />

‎Source/Csla.Xaml.Maui/Csla.Xaml.Maui.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup Condition="$(TargetFramework.StartsWith(&quot;net10&quot;))">
25-
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.0-rc.1.25452.6" />
26-
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.0-rc.1.25452.6" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0-rc.1.25451.107" />
25+
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.*" />
26+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.*" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.*" />
2828
</ItemGroup>
2929
<ItemGroup Condition="$(TargetFramework.StartsWith(&quot;net9&quot;))">
3030
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.12" />
3131
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.12" />
3232
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
3333
</ItemGroup>
3434
<ItemGroup Condition="'$(Configuration)'=='Release'">
35-
<PackageReference Include="Csla" Version="9.1.*" />
35+
<PackageReference Include="Csla" Version="10.0.0-beta-0010-g983ce0980c" />
3636
</ItemGroup>
3737
<ItemGroup Condition="'$(Configuration)'!='Release'">
3838
<ProjectReference Include="..\Csla\Csla.csproj" />

‎Source/Csla/Csla.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@
7979

8080
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
8181
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
82-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25502.107" />
83-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.2.25502.107" />
84-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
85-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107" />
86-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-rc.2.25502.107" />
87-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0-rc.2.25502.107" />
88-
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0-rc.2.25502.107" />
82+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
83+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
84+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
85+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
86+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0" />
87+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
88+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.0" />
8989
</ItemGroup>
9090
<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
9191
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

‎Source/global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"rollForward": "latestFeature",
4-
"version": "10.0.100-rc.1",
5-
"allowPrerelease": true
4+
"version": "10.0.100",
5+
"allowPrerelease": false
66
}
77
}

‎Source/tests/Csla.Blazor.Test/Csla.Blazor.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25502.107" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.2.25502.107" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25502.107" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1515
<PackageReference Include="MSTest.TestAdapter" Version="3.9.1" />
1616
<PackageReference Include="MSTest.TestFramework" Version="3.9.1" />

‎Source/tests/Csla.Blazor.WebAssembly.Tests/Csla.Blazor.WebAssembly.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25502.107" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.2.25502.107" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25502.107" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1515
<PackageReference Include="MSTest.TestAdapter" Version="3.9.1" />
1616
<PackageReference Include="MSTest.TestFramework" Version="3.9.1" />

‎Source/tests/Csla.TestHelpers/Csla.TestHelpers.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
11-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107" />
12-
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0-rc.2.25502.107" />
13-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.2.25502.107" />
10+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Source/tests/Csla.test/Csla.Tests.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
<PackageReference Include="MSTest.TestFramework" Version="3.9.1" />
5555
<PackageReference Include="System.Data.Common" Version="4.3.0" />
5656
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
57-
<PackageReference Include="System.Resources.Extensions" Version="10.0.0-rc.2.25502.107" />
58-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0-rc.2.25502.107" />
59-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0-rc.2.25502.107" />
60-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.2.25502.107" />
61-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.2.25502.107" />
62-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.2.25502.107" />
63-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0-rc.2.25502.107" />
57+
<PackageReference Include="System.Resources.Extensions" Version="10.0.0" />
58+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
59+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
60+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
61+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
62+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
63+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
6464
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
6565
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
6666
</ItemGroup>

0 commit comments

Comments
 (0)