Skip to content

Commit be7a372

Browse files
authored
[release/2.1] Bump some versions (#24655)
* Move to latest KoreBuild / .NET SDK * Align versions with aspnetcore updates - most versions should be pinned * Avoid a now-obsolete Xunit constructor
1 parent 1892d87 commit be7a372

File tree

3 files changed

+19
-20
lines changed

3 files changed

+19
-20
lines changed

build/dependencies.props

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,8 @@
55

66
<!-- These package versions may be overridden or updated by automation. -->
77
<PropertyGroup Label="Package Versions: Auto">
8-
<InternalAspNetCoreSdkPackageVersion>2.1.7-build-20190110.2</InternalAspNetCoreSdkPackageVersion>
9-
<MicrosoftCSharpPackageVersion>4.5.0</MicrosoftCSharpPackageVersion>
10-
<MicrosoftNETCoreApp21PackageVersion>2.1.7</MicrosoftNETCoreApp21PackageVersion>
11-
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
12-
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
13-
<SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
14-
<SystemDataSqlClientPackageVersion>4.5.1</SystemDataSqlClientPackageVersion>
15-
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
8+
<InternalAspNetCoreSdkPackageVersion>2.1.7-build-20210413.1</InternalAspNetCoreSdkPackageVersion>
9+
<MicrosoftNETCoreApp21PackageVersion>2.1.27</MicrosoftNETCoreApp21PackageVersion>
1610
</PropertyGroup>
1711

1812
<!-- This may import a generated file which may override the variables above. -->
@@ -21,7 +15,7 @@
2115
<!-- These are package versions that should not be overridden or updated by automation. -->
2216
<PropertyGroup Label="Package Versions: Pinned">
2317
<MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>2.1.1</MicrosoftAspNetCoreHostingWebHostBuilderFactorySourcesPackageVersion>
24-
<MicrosoftExtensionsCachingMemoryPackageVersion>2.1.1</MicrosoftExtensionsCachingMemoryPackageVersion>
18+
<MicrosoftExtensionsCachingMemoryPackageVersion>2.1.23</MicrosoftExtensionsCachingMemoryPackageVersion>
2519
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>2.1.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
2620
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>2.1.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
2721
<MicrosoftExtensionsConfigurationJsonPackageVersion>2.1.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
@@ -34,23 +28,28 @@
3428
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
3529
<FunctionalTests_PackageVersion>0.0.0</FunctionalTests_PackageVersion>
3630
<MicrosoftAzureDocumentDBCorePackageVersion>1.7.1</MicrosoftAzureDocumentDBCorePackageVersion>
37-
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
38-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
39-
<MicrosoftNETCoreApp11PackageVersion>1.1.8</MicrosoftNETCoreApp11PackageVersion>
31+
<MicrosoftCodeAnalysisCSharpPackageVersion>2.8.2</MicrosoftCodeAnalysisCSharpPackageVersion>
32+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>2.8.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
33+
<MicrosoftCSharpPackageVersion>4.5.0</MicrosoftCSharpPackageVersion>
34+
<MicrosoftNETCoreApp11PackageVersion>1.1.13</MicrosoftNETCoreApp11PackageVersion>
4035
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
41-
<MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
36+
<MicrosoftNETTestSdkPackageVersion>15.9.2</MicrosoftNETTestSdkPackageVersion>
4237
<NewtonsoftJsonPackageVersion>11.0.2</NewtonsoftJsonPackageVersion>
4338
<OracleManagedDataAccessPackageVersion>12.2.1100</OracleManagedDataAccessPackageVersion>
4439
<RemotionLinqPackageVersion>2.2.0</RemotionLinqPackageVersion>
4540
<SQLitePCLRawBundleGreenPackageVersion>1.1.12</SQLitePCLRawBundleGreenPackageVersion>
4641
<SQLitePCLRawBundleSqlcipherPackageVersion>1.1.12</SQLitePCLRawBundleSqlcipherPackageVersion>
4742
<SQLitePCLRawCorePackageVersion>1.1.12</SQLitePCLRawCorePackageVersion>
4843
<StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion>
44+
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
45+
<SystemComponentModelAnnotationsPackageVersion>4.5.0</SystemComponentModelAnnotationsPackageVersion>
46+
<SystemDataSqlClientPackageVersion>4.5.3</SystemDataSqlClientPackageVersion>
47+
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
4948
<SystemInteractiveAsyncPackageVersion>3.1.1</SystemInteractiveAsyncPackageVersion>
5049
<XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>
51-
<XunitAssertPackageVersion>2.3.1</XunitAssertPackageVersion>
52-
<XunitCorePackageVersion>2.3.1</XunitCorePackageVersion>
53-
<XunitPackageVersion>2.3.1</XunitPackageVersion>
54-
<XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
50+
<XunitAssertPackageVersion>2.4.1</XunitAssertPackageVersion>
51+
<XunitCorePackageVersion>2.4.1</XunitCorePackageVersion>
52+
<XunitPackageVersion>2.4.1</XunitPackageVersion>
53+
<XunitRunnerVisualStudioPackageVersion>2.4.1</XunitRunnerVisualStudioPackageVersion>
5554
</PropertyGroup>
5655
</Project>

korebuild-lock.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version:2.1.7-build-20210209.2
2-
commithash:e2b019a5c8d338b060644e2ea5437beea1f5a888
1+
version:2.1.7-build-20210413.1
2+
commithash:41a55f8d844c4be8c4afa5f70f72b80067f0d113

src/EFCore.Specification.Tests/TestUtilities/Xunit/SkippedTestCase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal class SkippedTestCase : XunitTestCase
1212
private string _skipReason;
1313

1414
public SkippedTestCase(string skipReason, IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, object[] testMethodArguments = null)
15-
: base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments)
15+
: base(diagnosticMessageSink, defaultMethodDisplay, TestMethodDisplayOptions.None, testMethod, testMethodArguments)
1616
{
1717
_skipReason = skipReason;
1818
}

0 commit comments

Comments
 (0)