Skip to content

Commit ac3cb41

Browse files
MarioEncaminaMarioEncamina
authored
Merge pull request #181 from Encamina/upgrade-to-NET10
Upgrade to net10
2 parents 37ee1c9 + e015780 commit ac3cb41

56 files changed

Lines changed: 131 additions & 202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@ Previous classification is not required if changes are simple or all belong to t
2323
- Added the new `CorrelationRehydrationMiddleware` to `DefaultMiddlewareUseRules`. This middleware rehydrates correlations from incoming activities in M365 Agents SDK.
2424

2525
### Major Changes
26+
- Upgrade to NET 10.0.
2627
- Added `Encamina.Enmarcha.AI.Agents`, `Encamina.Enmarcha.AI.Agents.Abstractions` and `Encamina.Enmarcha.Agents.Skills.QuestionAnswering` projects to provide support for the new Microsoft 365 Agents SDK.
2728
- Added `ICorrelationStore` and `DistributedCacheCorrelationStore` to store correlations (`CorrelationEntry`) in a distributed cache.
2829

2930
## Minor Changes
3031
- Updated dependencies:
3132
- Microsoft.Azure.Cosmos from `3.47.2` to `3.49.0`.
33+
- Semantic Kernerl Consolitaded to `1.66.0`.
3234

3335
- Modified the sample project `Encamina.Enmarcha.Samples.SemanticKernel.DocumentContentExtractor` to develop `MistralAIDocumentConnector`.
3436
- Added the connector `Encamina.Enmarcha.SemanticKernel.Connectors.Document\Connectors\MistralAIDocumentConnector.cs`: Extracts and processes PDF documents using MistralAI's Pixtral model for markdown extraction, with optional Azure OpenAI-based refinement and intelligent token-aware chunking with hierarchical metadata.

‎Directory.Build.props‎

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

1818
<PropertyGroup>
1919
<VersionPrefix>10.0.0</VersionPrefix>
20-
<VersionSuffix>preview-09</VersionSuffix>
20+
<VersionSuffix></VersionSuffix>
2121
</PropertyGroup>
2222

2323
<!--

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "10.0.100",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

‎samples/Data/Encamina.Enmarcha.Samples.Data.CosmosDB/Encamina.Enmarcha.Samples.Data.CosmosDB.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<UserSecretsId>9842d75c-175b-4dc5-927d-a7385f36a7ca</UserSecretsId>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎samples/Data/Encamina.Enmarcha.Samples.Data.EntityFramework/Encamina.Enmarcha.Samples.Data.EntityFramework.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎samples/SemanticKernel/Encamina.Enmarcha.Samples.SemanticKernel.DocumentContentExtractor/Encamina.Enmarcha.Samples.SemanticKernel.DocumentContentExtractor.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎samples/SemanticKernel/Encamina.Enmarcha.Samples.SemanticKernel.Text/Encamina.Enmarcha.Samples.SemanticKernel.Text.csproj‎

Lines changed: 1 addition & 1 deletion
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
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎src/Encamina.Enmarcha.AI.Abstractions/Encamina.Enmarcha.AI.Abstractions.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<PackageReadmeFile>README.md</PackageReadmeFile>
96
</PropertyGroup>
107

118
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
9+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.1" />
1310
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
1411
</ItemGroup>
1512

‎src/Encamina.Enmarcha.AI.IntentsPrediction.Azure/Encamina.Enmarcha.AI.IntentsPrediction.Azure.csproj‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<PackageReadmeFile>README.md</PackageReadmeFile>
96
</PropertyGroup>
107

118
<ItemGroup>
129
<PackageReference Include="Azure.AI.Language.Conversations" Version="1.1.0" />
1310
<PackageReference Include="Azure.Core" Version="1.45.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
16-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.1" />
1815
</ItemGroup>
1916

2017
<ItemGroup>

‎src/Encamina.Enmarcha.AI.LanguagesDetection.Azure/Encamina.Enmarcha.AI.LanguagesDetection.Azure.csproj‎

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

33
<PropertyGroup>
44
<TargetFramework>netstandard2.1</TargetFramework>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<PackageReadmeFile>README.md</PackageReadmeFile>
96
</PropertyGroup>
107

118
<ItemGroup>
129
<PackageReference Include="Azure.AI.TextAnalytics" Version="5.3.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
15-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
16-
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
17-
<PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.1" />
11+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
12+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="10.0.1" />
14+
<PackageReference Include="System.Net.Http.Json" Version="10.0.1" />
1815
</ItemGroup>
1916

2017
<ItemGroup>

0 commit comments

Comments
 (0)
⚡