diff --git a/Directory.Packages.props b/Directory.Packages.props index 01edcee871c..3e248f71184 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -32,6 +32,7 @@ + @@ -54,12 +55,5 @@ - - - - - - - diff --git a/EFCore.sln b/EFCore.sln index b835bb26b56..0999c19305c 100644 --- a/EFCore.sln +++ b/EFCore.sln @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json tools\Resources.tt = tools\Resources.tt eng\Versions.props = eng\Versions.props + NuGet.config = NuGet.config EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}" diff --git a/eng/Versions.props b/eng/Versions.props index 78f8e60baa5..24c3b6ea6d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,11 +36,12 @@ 10.0.0-beta.25126.4 - 17.8.3 - 17.8.3 - - 4.8.0 - 1.1.2 + 17.13.9 + 17.13.9 + + 4.13.0 + 1.1.3-beta1.24423.1 + 1.1.3-beta1.24352.1 1.13.1 1.3.2 1.8.1 diff --git a/src/EFCore.Analyzers/EFCore.Analyzers.csproj b/src/EFCore.Analyzers/EFCore.Analyzers.csproj index 4b145c8c2a1..981fa72f5c4 100644 --- a/src/EFCore.Analyzers/EFCore.Analyzers.csproj +++ b/src/EFCore.Analyzers/EFCore.Analyzers.csproj @@ -11,6 +11,7 @@ true true $(NoWarn);NU5128 + $(NoWarn);RS1038 diff --git a/src/EFCore.Analyzers/InternalUsageDiagnosticAnalyzer.cs b/src/EFCore.Analyzers/InternalUsageDiagnosticAnalyzer.cs index 291926112ad..2f6579ef1ef 100644 --- a/src/EFCore.Analyzers/InternalUsageDiagnosticAnalyzer.cs +++ b/src/EFCore.Analyzers/InternalUsageDiagnosticAnalyzer.cs @@ -23,8 +23,7 @@ private static readonly DiagnosticDescriptor Descriptor defaultSeverity: DiagnosticSeverity.Warning, isEnabledByDefault: true); - public override ImmutableArray SupportedDiagnostics - => ImmutableArray.Create(Descriptor); + public override ImmutableArray SupportedDiagnostics => [Descriptor]; public override void Initialize(AnalysisContext context) { diff --git a/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesCodeFixProvider.cs b/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesCodeFixProvider.cs index 4ad0cbd0c20..adcd46f5371 100644 --- a/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesCodeFixProvider.cs +++ b/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesCodeFixProvider.cs @@ -15,8 +15,7 @@ namespace Microsoft.EntityFrameworkCore; [Shared] public sealed class InterpolatedStringUsageInRawQueriesCodeFixProvider : CodeFixProvider { - public override ImmutableArray FixableDiagnosticIds - => ImmutableArray.Create(EFDiagnostics.InterpolatedStringUsageInRawQueries); + public override ImmutableArray FixableDiagnosticIds => [EFDiagnostics.InterpolatedStringUsageInRawQueries]; public override FixAllProvider GetFixAllProvider() => WellKnownFixAllProviders.BatchFixer; diff --git a/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs b/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs index 4de8039d555..5d7f07b5523 100644 --- a/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs +++ b/src/EFCore.Analyzers/InterpolatedStringUsageInRawQueriesDiagnosticAnalyzer.cs @@ -21,8 +21,7 @@ private static readonly DiagnosticDescriptor Descriptor defaultSeverity: DiagnosticSeverity.Warning, isEnabledByDefault: true); - public override ImmutableArray SupportedDiagnostics - => ImmutableArray.Create(Descriptor); + public override ImmutableArray SupportedDiagnostics => [Descriptor]; public override void Initialize(AnalysisContext context) { diff --git a/src/EFCore.Analyzers/UninitializedDbSetDiagnosticSuppressor.cs b/src/EFCore.Analyzers/UninitializedDbSetDiagnosticSuppressor.cs index 09c78dfce36..234ee5e3b69 100644 --- a/src/EFCore.Analyzers/UninitializedDbSetDiagnosticSuppressor.cs +++ b/src/EFCore.Analyzers/UninitializedDbSetDiagnosticSuppressor.cs @@ -17,8 +17,7 @@ public sealed class UninitializedDbSetDiagnosticSuppressor : DiagnosticSuppresso justification: AnalyzerStrings.UninitializedDbSetWarningSuppressionJustification); /// - public override ImmutableArray SupportedSuppressions { get; } - = ImmutableArray.Create(SuppressUninitializedDbSetRule); + public override ImmutableArray SupportedSuppressions { get; } = [SuppressUninitializedDbSetRule]; /// public override void ReportSuppressions(SuppressionAnalysisContext context) @@ -28,7 +27,7 @@ public override void ReportSuppressions(SuppressionAnalysisContext context) foreach (var diagnostic in context.ReportedDiagnostics) { - // We have an warning about an uninitialized non-nullable property. + // We have a warning about an uninitialized non-nullable property. // CS8618 contains the location of the uninitialized property in AdditionalLocations; note that if the class has a constructor, // the diagnostic main Location points to the constructor rather than to the uninitialized property. diff --git a/src/EFCore.Tasks/EFCore.Tasks.csproj b/src/EFCore.Tasks/EFCore.Tasks.csproj index eb72b2ae76a..6e4d77a6802 100644 --- a/src/EFCore.Tasks/EFCore.Tasks.csproj +++ b/src/EFCore.Tasks/EFCore.Tasks.csproj @@ -49,7 +49,6 @@ - diff --git a/test/Directory.Packages.props b/test/Directory.Packages.props index de8a6dc1cf3..159e8cf66ef 100644 --- a/test/Directory.Packages.props +++ b/test/Directory.Packages.props @@ -1,11 +1,13 @@ + + - - - + + + + - @@ -21,12 +23,6 @@ - - - - - - diff --git a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj index 084a382f3ab..c763d148fe9 100644 --- a/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj +++ b/test/EFCore.Analyzers.Tests/EFCore.Analyzers.Tests.csproj @@ -6,6 +6,8 @@ Microsoft.EntityFrameworkCore true true + + $(NoWarn);NU1608 @@ -45,10 +47,10 @@ - - - - + + + + diff --git a/test/EFCore.Relational.Specification.Tests/TestUtilities/PrecompiledQueryTestHelpers.cs b/test/EFCore.Relational.Specification.Tests/TestUtilities/PrecompiledQueryTestHelpers.cs index 14b4f0bc9ca..6cfd60b610d 100644 --- a/test/EFCore.Relational.Specification.Tests/TestUtilities/PrecompiledQueryTestHelpers.cs +++ b/test/EFCore.Relational.Specification.Tests/TestUtilities/PrecompiledQueryTestHelpers.cs @@ -84,7 +84,7 @@ public async Task FullSourceTest( // This turns on the interceptors feature for the designated namespace(s). var parseOptions = new CSharpParseOptions().WithFeatures( [ - new KeyValuePair("InterceptorsPreviewNamespaces", "Microsoft.EntityFrameworkCore.GeneratedInterceptors") + new KeyValuePair("InterceptorsNamespaces", "Microsoft.EntityFrameworkCore.GeneratedInterceptors") ]); var syntaxTree = CSharpSyntaxTree.ParseText(source, parseOptions, path: "Test.cs");