Skip to content

Commit 0efd11c

Browse files
renemadsenrenemadsen
committed
Merge branch 'PomeloFoundation-main'
2 parents c1f4fd6 + 4a990fd commit 0efd11c

File tree

327 files changed

+47178
-9471
lines changed

Some content is hidden

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

327 files changed

+47178
-9471
lines changed

‎.github/CODEOWNERS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Can be changed to /.github/workflows/ if necessary.
2+
/.github/ @PomeloFoundation/CIAdmin

‎.github/workflows/build.yml‎

Lines changed: 438 additions & 0 deletions
Large diffs are not rendered by default.

‎Dependencies.targets‎

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Common Versions">
3-
<EFCoreVersion>7.*</EFCoreVersion>
3+
<EFCoreVersion>[9.0.0-preview.1.24081.2,9.0.0-preview.1.999999]</EFCoreVersion>
44
</PropertyGroup>
55

66
<ItemGroup Label="Dependencies">
@@ -9,40 +9,45 @@
99
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
1010
<PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
1111

12-
<PackageReference Update="MySqlConnector" Version="2.2.5" />
12+
<PackageReference Update="MySqlConnector" Version="2.3.5" />
13+
<PackageReference Update="MySqlConnector.DependencyInjection" Version="2.3.5" />
1314

1415
<PackageReference Update="NetTopologySuite" Version="2.5.0" />
15-
<PackageReference Update="System.Text.Json" Version="7.0.1" />
16-
<PackageReference Update="Newtonsoft.Json" Version="13.0.2" />
16+
<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
1717

1818
<PackageReference Update="Castle.Core" Version="5.1.1" />
19-
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
20-
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.2" />
21-
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
19+
<PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="[8.0.0,8.0.999]" />
20+
<PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.0,8.0.999]" />
21+
<PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
2222
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
23-
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
24-
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="7.0.2" />
25-
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
26-
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
27-
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
28-
<PackageReference Update="Microsoft.Extensions.Configuration" Version="7.0.0" />
29-
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
30-
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
31-
<PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
32-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.1" />
33-
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
34-
<PackageReference Update="Moq" Version="4.18.4" />
35-
<PackageReference Update="System.Collections.Immutable" Version="7.0.0" />
23+
<PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
24+
<PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
25+
<PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
26+
<PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
27+
<PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
28+
<PackageReference Update="Microsoft.Extensions.Configuration" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" /> <!-- CHECK: used? -->
29+
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
30+
<PackageReference Update="Microsoft.Extensions.DependencyModel" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
31+
<PackageReference Update="Microsoft.Extensions.Logging" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
32+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.9.0" />
33+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
34+
<PackageReference Update="Moq" Version="4.20.70" />
35+
<PackageReference Update="System.Collections.Immutable" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
3636
<PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
37-
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
38-
<PackageReference Update="xunit.assert" Version="2.4.2" />
39-
<PackageReference Update="xunit.core" Version="2.4.2" />
40-
<PackageReference Update="xunit.runner.console" Version="2.4.2" />
41-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
37+
<PackageReference Update="System.Diagnostics.DiagnosticSource" Version="[9.0.0-preview.1.24080.9,9.0.0-preview.1.999999]" />
38+
<PackageReference Update="GitHubActionsTestLogger" Version="2.3.3" />
39+
<PackageReference Update="Xunit.SkippableFact" Version="1.4.13" />
4240

4341
<!-- Keep at the same level that the EF Core projects use. -->
42+
<PackageReference Update="xunit.assert" Version="2.6.1" />
43+
<PackageReference Update="xunit.core" Version="2.6.1" />
44+
<PackageReference Update="xunit.runner.console" Version="2.6.1" />
45+
<PackageReference Update="xunit.runner.visualstudio" Version="2.5.3" />
4446
<PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
4547
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
46-
<PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
48+
<PackageReference Update="Microsoft.CodeAnalysis" Version="4.5.0" />
49+
<PackageReference Update="Microsoft.CodeAnalysis.Features" Version="4.5.0" />
50+
<PackageReference Update="Microsoft.CodeAnalysis.CSharp.Features" Version="4.5.0" />
51+
<PackageReference Update="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.5.0" />
4752
</ItemGroup>
4853
</Project>

‎Directory.Build.props‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,24 @@
1313
<PackageIcon>icon.png</PackageIcon>
1414
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1515
<LangVersion>latest</LangVersion>
16-
<DebugType>portable</DebugType>
1716
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
1817
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1918
<PackageProjectUrl>https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql</PackageProjectUrl>
2019
<RepositoryType>git</RepositoryType>
21-
<RepositoryUrl>https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql.git</RepositoryUrl>
20+
<RepositoryUrl>https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql</RepositoryUrl>
2221
</PropertyGroup>
2322

2423
<PropertyGroup>
25-
<PomeloTargetFrameworks>net6.0;net7.0</PomeloTargetFrameworks>
26-
<PomeloTestTargetFramework>net7.0</PomeloTestTargetFramework>
27-
<EfCoreTargetFramework>net6.0</EfCoreTargetFramework>
28-
<EfCoreTestTargetFramework>net7.0</EfCoreTestTargetFramework>
24+
<DebugType Condition="'$(DebugType)' == ''">portable</DebugType>
25+
</PropertyGroup>
26+
27+
<PropertyGroup>
28+
<PomeloTargetFramework>net8.0</PomeloTargetFramework>
29+
<PomeloTestTargetFramework>net8.0</PomeloTestTargetFramework>
30+
<EfCoreTargetFramework>net8.0</EfCoreTargetFramework>
31+
<EfCoreTestTargetFramework>net8.0</EfCoreTestTargetFramework>
32+
<MySqlConnectorTargetFramework>net8.0</MySqlConnectorTargetFramework>
33+
<MySqlConnectorDependencyInjectionTargetFramework>net7.0</MySqlConnectorDependencyInjectionTargetFramework>
2934
</PropertyGroup>
3035

3136
<PropertyGroup>

‎NuGet.config‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4-
<add key="Pomelo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" />
5-
<!--<add key="myget.org" value="https://www.myget.org/F/pomelo/api/v3/index.json" />-->
6-
<!-- Package sources used by EF Core: -->
7-
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
8-
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
9-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
10-
<add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
11-
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
12-
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
4+
<add key="pomelo-nightly-public-azdo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-public/nuget/v3/index.json" />
5+
<add key="pomelo-nightly-debug-azdo" value="https://pkgs.dev.azure.com/pomelo-efcore/Pomelo.EntityFrameworkCore.MySql/_packaging/pomelo-efcore-debug/nuget/v3/index.json" />
6+
<add key="pomelo-nightly-public-myget" value="https://www.myget.org/F/pomelo/api/v3/index.json" />
7+
<add key="pomelo-nightly-debug-myget" value="https://www.myget.org/F/pomelo-debug/api/v3/index.json" />
138

149
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
10+
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
11+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
12+
1513
</packageSources>
1614
</configuration>

0 commit comments

Comments
 (0)