Skip to content

Commit af616e5

Browse files
DevExpressExampleBotDevExpressExampleBot
committed
Create 24.2.1+ branch
1 parent 8511459 commit af616e5

File tree

11 files changed

+74
-67
lines changed

11 files changed

+74
-67
lines changed

‎CS/EFCore/ItemCountEF/ItemCountEF.Blazor.Server/ItemCountEF.Blazor.Server.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk.Web">
23
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
45
<CheckEolTargetFramework>false</CheckEolTargetFramework>
56
<Deterministic>false</Deterministic>
67
<AssemblyVersion>1.0.*</AssemblyVersion>
@@ -17,10 +18,10 @@
1718
</Content>
1819
</ItemGroup>
1920
<ItemGroup>
20-
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="22.2.5" />
21-
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.5" />
21+
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="24.2.1-alpha-24207" />
22+
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="24.2.1-alpha-24207" />
2223
</ItemGroup>
2324
<ItemGroup>
2425
<ProjectReference Include="..\ItemCountEF.Module\ItemCountEF.Module.csproj" />
2526
</ItemGroup>
26-
</Project>
27+
</Project>

‎CS/EFCore/ItemCountEF/ItemCountEF.Blazor.Server/Startup.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public void ConfigureServices(IServiceCollection services) {
5050
options.UseSqlServer(connectionString);
5151
options.UseChangeTrackingProxies();
5252
options.UseObjectSpaceLinkProxies();
53+
options.UseXafServiceProviderContainer(serviceProvider);
5354
options.UseLazyLoadingProxies();
5455
})
5556
.AddNonPersistent();

‎CS/EFCore/ItemCountEF/ItemCountEF.Blazor.Server/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Languages": "en-US;",
1818
"ShowLanguageSwitcher": false,
1919
"ThemeSwitcher": {
20-
"DefaultItemName": "Office White",
20+
"DefaultItemName": "Office White", // This line is changed according to the following BC: https://supportcenter.devexpress.com/internal/ticket/details/t1090666,
2121
"ShowSizeModeSwitcher": true,
2222
"Groups": [
2323
{

‎CS/EFCore/ItemCountEF/ItemCountEF.Module/ItemCountEF.Module.csproj‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
45
<CheckEolTargetFramework>false</CheckEolTargetFramework>
56
<Deterministic>false</Deterministic>
67
<AssemblyVersion>1.0.*</AssemblyVersion>
@@ -15,13 +16,13 @@
1516
<EmbeddedResource Include="Model.DesignedDiffs.xafml" />
1617
</ItemGroup>
1718
<ItemGroup>
18-
<PackageReference Include="DevExpress.ExpressApp" Version="22.2.5" />
19-
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.5" />
20-
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="22.2.5" />
21-
<PackageReference Include="DevExpress.ExpressApp.Objects" Version="22.2.5" />
22-
<PackageReference Include="DevExpress.Persistent.Base" Version="22.2.5" />
23-
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="22.2.5" />
19+
<PackageReference Include="DevExpress.ExpressApp" Version="24.2.1-alpha-24207" />
20+
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="24.2.1-alpha-24207" />
21+
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="24.2.1-alpha-24207" />
22+
<PackageReference Include="DevExpress.ExpressApp.Objects" Version="24.2.1-alpha-24207" />
23+
<PackageReference Include="DevExpress.Persistent.Base" Version="24.2.1-alpha-24207" />
24+
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="24.2.1-alpha-24207" />
2425
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.10" />
2526
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.10" />
2627
</ItemGroup>
27-
</Project>
28+
</Project>

‎CS/EFCore/ItemCountEF/ItemCountEF.Win/App.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
@@ -13,24 +13,24 @@
1313
</DevExpress.LookAndFeel.Design.AppSettings>
1414
</applicationSettings>
1515
<appSettings>
16-
<add key="Modules" value=""/>
17-
<add key="NewVersionServer" value=""/>
18-
<add key="EnableDiagnosticActions" value="False"/>
16+
<add key="Modules" value="" />
17+
<add key="NewVersionServer" value="" />
18+
<add key="EnableDiagnosticActions" value="False" />
1919
<!--
2020
Use the one of predefined values: None, ApplicationFolder, CurrentUserApplicationDataFolder. The default value is ApplicationFolder.
2121
<add key="TraceLogLocation" value="CurrentUserApplicationDataFolder"/>
2222
<add key="UserModelDiffsLocation" value="CurrentUserApplicationDataFolder"/>
2323
<add key="Languages" value="de;es;ja"/>
2424
-->
2525
<!-- Use one of the following predefined values: 0-Off, 1-Errors, 2-Warnings, 3-Info, 4-Verbose. The default value is 3. -->
26-
<add key="eXpressAppFrameworkTraceLevel" value="3"/>
26+
<add key="eXpressAppFrameworkTraceLevel" value="3" />
2727
</appSettings>
2828
<connectionStrings>
29-
<add name="EasyTestConnectionString" connectionString="Integrated Security=SSPI;MultipleActiveResultSets=true;Data Source=(localdb)\mssqllocaldb;Initial Catalog=ItemCountEFEasyTest" providerName="System.Data.SqlClient"/>
29+
<add name="EasyTestConnectionString" connectionString="Integrated Security=SSPI;MultipleActiveResultSets=true;Data Source=(localdb)\mssqllocaldb;Initial Catalog=ItemCountEFEasyTest" providerName="System.Data.SqlClient" />
3030
<add name="ConnectionString" connectionString="Integrated Security=SSPI;MultipleActiveResultSets=True;Data Source=(localdb)\mssqllocaldb;Initial Catalog=ItemCountEF" providerName="System.Data.SqlClient" />
3131
<!--
3232
Use the following connection string to connect to a Jet (Microsoft Access) database:
3333
<add name="ConnectionString" connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Password=;User ID=Admin;Data Source=ItemCountEF.mdb;Mode=Share Deny None;"/>
3434
-->
3535
</connectionStrings>
36-
</configuration>
36+
</configuration>

‎CS/EFCore/ItemCountEF/ItemCountEF.Win/ItemCountEF.Win.csproj‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
34
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0-windows</TargetFramework>
5+
<TargetFramework>net8.0-windows</TargetFramework>
56
<CheckEolTargetFramework>false</CheckEolTargetFramework>
67
<UseWindowsForms>true</UseWindowsForms>
78
<ApplicationIcon>ExpressApp.ico</ApplicationIcon>
@@ -12,7 +13,7 @@
1213
<ImplicitUsings>enable</ImplicitUsings>
1314
</PropertyGroup>
1415
<ItemGroup>
15-
<Using Include="DevExpress.ExpressApp.ListView" Alias="ListView" />
16+
<Using Include="DevExpress.ExpressApp.ListView" Alias="ListView" />
1617
</ItemGroup>
1718
<ItemGroup>
1819
<None Remove="Model.xafml" />
@@ -27,15 +28,15 @@
2728
<EmbeddedResource Include="Images\Logo.svg" />
2829
</ItemGroup>
2930
<ItemGroup>
30-
<PackageReference Include="DevExpress.ExpressApp" Version="22.2.5" />
31-
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.5" />
32-
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="22.2.5" />
33-
<PackageReference Include="DevExpress.ExpressApp.Win" Version="22.2.5" />
34-
<PackageReference Include="DevExpress.ExpressApp.Win.Design" Version="22.2.5" />
35-
<PackageReference Include="DevExpress.Persistent.Base" Version="22.2.5" />
36-
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="22.2.5" />
37-
<PackageReference Include="DevExpress.RichEdit.Export" Version="22.2.5" />
38-
<PackageReference Include="DevExpress.Win.Design" Version="22.2.5" />
31+
<PackageReference Include="DevExpress.ExpressApp" Version="24.2.1-alpha-24207" />
32+
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="24.2.1-alpha-24207" />
33+
<PackageReference Include="DevExpress.ExpressApp.EFCore" Version="24.2.1-alpha-24207" />
34+
<PackageReference Include="DevExpress.ExpressApp.Win" Version="24.2.1-alpha-24207" />
35+
<PackageReference Include="DevExpress.ExpressApp.Win.Design" Version="24.2.1-alpha-24207" />
36+
<PackageReference Include="DevExpress.Persistent.Base" Version="24.2.1-alpha-24207" />
37+
<PackageReference Include="DevExpress.Persistent.BaseImpl.EFCore" Version="24.2.1-alpha-24207" />
38+
<PackageReference Include="DevExpress.RichEdit.Export" Version="24.2.1-alpha-24207" />
39+
<PackageReference Include="DevExpress.Win.Design" Version="24.2.1-alpha-24207" />
3940
</ItemGroup>
4041
<ItemGroup>
4142
<ProjectReference Include="..\ItemCountEF.Module\ItemCountEF.Module.csproj" />

‎CS/XPO/ItemCount/ItemCount.Blazor.Server/ItemCount.Blazor.Server.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk.Web">
23
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
45
<CheckEolTargetFramework>false</CheckEolTargetFramework>
56
<Deterministic>false</Deterministic>
67
<AssemblyVersion>1.0.*</AssemblyVersion>
@@ -17,10 +18,10 @@
1718
</Content>
1819
</ItemGroup>
1920
<ItemGroup>
20-
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="22.2.5" />
21-
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.5" />
21+
<PackageReference Include="DevExpress.ExpressApp.Blazor" Version="24.2.1-alpha-24207" />
22+
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="24.2.1-alpha-24207" />
2223
</ItemGroup>
2324
<ItemGroup>
2425
<ProjectReference Include="..\ItemCount.Module\ItemCount.Module.csproj" />
2526
</ItemGroup>
26-
</Project>
27+
</Project>

‎CS/XPO/ItemCount/ItemCount.Blazor.Server/appsettings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"Languages": "en-US;",
1818
"ShowLanguageSwitcher": false,
1919
"ThemeSwitcher": {
20-
"DefaultItemName": "Office White",
20+
"DefaultItemName": "Office White", // This line is changed according to the following BC: https://supportcenter.devexpress.com/internal/ticket/details/t1090666,
2121
"ShowSizeModeSwitcher": true,
2222
"Groups": [
2323
{

‎CS/XPO/ItemCount/ItemCount.Module/ItemCount.Module.csproj‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
23
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
45
<CheckEolTargetFramework>false</CheckEolTargetFramework>
56
<Deterministic>false</Deterministic>
67
<AssemblyVersion>1.0.*</AssemblyVersion>
@@ -15,11 +16,11 @@
1516
<EmbeddedResource Include="Model.DesignedDiffs.xafml" />
1617
</ItemGroup>
1718
<ItemGroup>
18-
<PackageReference Include="DevExpress.ExpressApp" Version="22.2.5" />
19-
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="22.2.5" />
20-
<PackageReference Include="DevExpress.ExpressApp.Objects" Version="22.2.5" />
21-
<PackageReference Include="DevExpress.ExpressApp.Xpo" Version="22.2.5" />
22-
<PackageReference Include="DevExpress.Persistent.Base" Version="22.2.5" />
23-
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="22.2.5" />
19+
<PackageReference Include="DevExpress.ExpressApp" Version="24.2.1-alpha-24207" />
20+
<PackageReference Include="DevExpress.ExpressApp.CodeAnalysis" Version="24.2.1-alpha-24207" />
21+
<PackageReference Include="DevExpress.ExpressApp.Objects" Version="24.2.1-alpha-24207" />
22+
<PackageReference Include="DevExpress.ExpressApp.Xpo" Version="24.2.1-alpha-24207" />
23+
<PackageReference Include="DevExpress.Persistent.Base" Version="24.2.1-alpha-24207" />
24+
<PackageReference Include="DevExpress.Persistent.BaseImpl.Xpo" Version="24.2.1-alpha-24207" />
2425
</ItemGroup>
2526
</Project>

‎CS/XPO/ItemCount/ItemCount.Win/App.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
44
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
@@ -13,24 +13,24 @@
1313
</DevExpress.LookAndFeel.Design.AppSettings>
1414
</applicationSettings>
1515
<appSettings>
16-
<add key="Modules" value=""/>
17-
<add key="NewVersionServer" value=""/>
18-
<add key="EnableDiagnosticActions" value="False"/>
16+
<add key="Modules" value="" />
17+
<add key="NewVersionServer" value="" />
18+
<add key="EnableDiagnosticActions" value="False" />
1919
<!--
2020
Use the one of predefined values: None, ApplicationFolder, CurrentUserApplicationDataFolder. The default value is ApplicationFolder.
2121
<add key="TraceLogLocation" value="CurrentUserApplicationDataFolder"/>
2222
<add key="UserModelDiffsLocation" value="CurrentUserApplicationDataFolder"/>
2323
<add key="Languages" value="de;es;ja"/>
2424
-->
2525
<!-- Use one of the following predefined values: 0-Off, 1-Errors, 2-Warnings, 3-Info, 4-Verbose. The default value is 3. -->
26-
<add key="eXpressAppFrameworkTraceLevel" value="3"/>
26+
<add key="eXpressAppFrameworkTraceLevel" value="3" />
2727
</appSettings>
2828
<connectionStrings>
29-
<add name="EasyTestConnectionString" connectionString="Integrated Security=SSPI;Pooling=false;Data Source=(localdb)\mssqllocaldb;Initial Catalog=ItemCountEasyTest"/>
29+
<add name="EasyTestConnectionString" connectionString="Integrated Security=SSPI;Pooling=false;Data Source=(localdb)\mssqllocaldb;Initial Catalog=ItemCountEasyTest" />
3030
<add name="ConnectionString" connectionString="Integrated Security=SSPI;Pooling=false;Data Source=(localdb)\mssqllocaldb;Initial Catalog=ItemCount" />
3131
<!--
3232
Use the following connection string to connect to a Jet (Microsoft Access) database:
3333
<add name="ConnectionString" connectionString="Provider=Microsoft.Jet.OLEDB.4.0;Password=;User ID=Admin;Data Source=ItemCount.mdb;Mode=Share Deny None;"/>
3434
-->
3535
</connectionStrings>
36-
</configuration>
36+
</configuration>

0 commit comments

Comments
 (0)