Skip to content

Commit d7dc95c

Browse files
committed
Merge branch 'net10'
2 parents 78a605c + f19e048 commit d7dc95c

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,11 @@ jobs:
369369
Copy-Item test/EFCore.MySql.FunctionalTests/config.json.example test/EFCore.MySql.FunctionalTests/config.json
370370
Copy-Item test/EFCore.MySql.IntegrationTests/appsettings.ci.json test/EFCore.MySql.IntegrationTests/appsettings.json
371371
Copy-Item test/EFCore.MySql.IntegrationTests/config.json.example test/EFCore.MySql.IntegrationTests/config.json
372+
- name: Build Solution
373+
shell: pwsh
374+
run: |
375+
dotnet build -c Debug
376+
dotnet build -c Release
372377
- name: Setup Integration Tests
373378
shell: pwsh
374379
run: |

Directory.Packages.props

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,49 @@
11
<Project>
22
<PropertyGroup Label="Common Versions">
3-
<!-- In theory, the following should work, but it doesn't: [10.0.0,10.1.0-0)
3+
<!-- In theory, the following should work, but it doesn't: [10.0.1,10.1.0-0)
44
`-0` is the smallest possible prerelease version according to SemVer2.
55
-->
6-
<EFCoreVersion>[10.0.0,10.0.999]</EFCoreVersion>
6+
<EFCoreVersion>[10.0.1,10.0.999]</EFCoreVersion>
77
</PropertyGroup>
8-
98
<ItemGroup Label="Dependencies">
109
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
1110
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreVersion)" />
1211
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
1312
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
14-
1513
<PackageVersion Include="MySqlConnector" Version="2.5.0" />
1614
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.5.0" />
17-
1815
<PackageVersion Include="NetTopologySuite" Version="2.6.0" />
1916
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
20-
2117
<PackageVersion Include="Castle.Core" Version="5.2.1" />
22-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
23-
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
24-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
18+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.1" />
19+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.1" />
20+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1" />
2521
<!--<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />-->
26-
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
27-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
28-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
31-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" /> <!-- CHECK: used? -->
32-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
34-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
22+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.1" />
23+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
24+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.1" />
25+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="10.0.1" />
26+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
27+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
28+
<!-- CHECK: used? -->
29+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
30+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.1" />
31+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.1" />
3532
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3633
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
3734
<PackageVersion Include="Moq" Version="4.20.72" />
38-
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
35+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.1" />
3936
<PackageVersion Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
40-
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.0" />
37+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.1" />
4138
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
4239
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
43-
4440
<!-- Keep at the same level that the EF Core projects use. -->
4541
<PackageVersion Include="xunit.assert" Version="2.9.3" />
4642
<PackageVersion Include="xunit.core" Version="2.9.3" />
4743
<PackageVersion Include="xunit.runner.console" Version="2.9.3" />
4844
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
4945
<PackageVersion Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
5046
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
51-
5247
<!-- Needed when using EFCore.Design assembly from local EF Core repository. -->
5348
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.14.0" />
5449
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />

0 commit comments

Comments
 (0)