From 7eb0f830dd87bb822664d9c3196254ee21d944b9 Mon Sep 17 00:00:00 2001 From: Nikolay Pianikov Date: Tue, 5 Nov 2024 16:56:36 +0300 Subject: [PATCH] Updating internal Pure.DI to 2.1.37 --- Directory.Build.props | 3 ++- build/ReadmeTarget.cs | 18 +++++++++++++----- readme/Avalonia.md | 2 +- readme/BlazorServerApp.md | 2 +- readme/BlazorWebAssemblyApp.md | 2 +- readme/Console.md | 2 +- readme/ConsoleNativeAOT.md | 2 +- readme/ConsoleTopLevelStatements.md | 2 +- readme/GrpcService.md | 2 +- readme/Maui.md | 2 +- readme/MinimalWebAPI.md | 2 +- readme/WebAPI.md | 2 +- readme/WebApp.md | 2 +- readme/WinFormsApp.md | 2 +- readme/WinFormsAppNetCore.md | 2 +- readme/Wpf.md | 2 +- samples/AvaloniaApp/AvaloniaApp.csproj | 1 - .../ShroedingersCatNativeAOT.csproj | 1 - .../ShroedingersCatTopLevelStatements.csproj | 1 - .../SingleRootAvaloniaApp.csproj | 1 - .../Pure.DI.Abstractions.csproj | 1 - src/Pure.DI.Core/Components/Api.g.cs | 2 +- .../Components/GenericTypeArguments.g.cs | 2 +- src/Pure.DI.Core/Features/Default.g.cs | 2 +- src/Pure.DI.Core/Pure.DI.Core.csproj | 2 +- src/Pure.DI.Templates/Pure.DI.Templates.csproj | 1 - tests/Pure.DI.Example/Pure.DI.Example.csproj | 1 - .../Pure.DI.UsageTests.csproj | 1 - 28 files changed, 33 insertions(+), 32 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b00104c3b..ef6d81c89 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 2.1.36 + 2.1.37 Pure.DI latest net8.0 @@ -19,6 +19,7 @@ Copyright (C) $([System.DateTime]::Now.Year) Nikolay Pianikov true False + NETSDK1215;NETSDK1057;NU3005;NU5128;NU1902;NU1903;NU1904;NU1108;CS8321;CA1050;NU1801;CS1591 diff --git a/build/ReadmeTarget.cs b/build/ReadmeTarget.cs index ed12c89a0..8c4aeb9a5 100644 --- a/build/ReadmeTarget.cs +++ b/build/ReadmeTarget.cs @@ -8,6 +8,7 @@ namespace Build; internal class ReadmeTarget( Commands commands, + Settings settings, Env env, Versions versions, [Tag(typeof(BenchmarksTarget))] ITarget benchmarksTarget) @@ -60,22 +61,29 @@ public async Task RunAsync(CancellationToken cancellationToken) Directory.Delete(generatedFiles, true); } - var usageTestsProjects = Path.Combine(solutionDirectory, "tests", "Pure.DI.UsageTests", "Pure.DI.UsageTests.csproj"); + var usageTestsProject = Path.Combine(solutionDirectory, "tests", "Pure.DI.UsageTests", "Pure.DI.UsageTests.csproj"); var projects = new[] { - usageTestsProjects, + usageTestsProject, Path.Combine(solutionDirectory, "benchmarks", "Pure.DI.Benchmarks", "Pure.DI.Benchmarks.csproj") }; + var msbuild = new MSBuild() + .WithTarget("clean;rebuild") + .WithProps(("Configuration", settings.Configuration)); + foreach (var project in projects) { - await new MSBuild() + await msbuild .WithProject(project) - .WithTarget("clean;rebuild") .BuildAsync(cancellationToken: cancellationToken).EnsureSuccess(); } - await new DotNetTest(usageTestsProjects).RunAsync(cancellationToken: cancellationToken).EnsureSuccess(); + await new DotNetTest() + .WithProject(usageTestsProject) + .WithNoBuild(true) + .WithConfiguration(settings.Configuration) + .RunAsync(cancellationToken: cancellationToken).EnsureSuccess(); await using var readmeWriter = File.CreateText(ReadmeFile); diff --git a/readme/Avalonia.md b/readme/Avalonia.md index b17b54f60..c10ca779c 100644 --- a/readme/Avalonia.md +++ b/readme/Avalonia.md @@ -176,7 +176,7 @@ The [project file](/samples/AvaloniaApp/AvaloniaApp.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/BlazorServerApp.md b/readme/BlazorServerApp.md index c7b5acd3d..3c7306df9 100644 --- a/readme/BlazorServerApp.md +++ b/readme/BlazorServerApp.md @@ -70,7 +70,7 @@ The [project file](/samples/BlazorServerApp/BlazorServerApp.csproj) looks like t - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/BlazorWebAssemblyApp.md b/readme/BlazorWebAssemblyApp.md index aa3f3e64f..8be9b5dff 100644 --- a/readme/BlazorWebAssemblyApp.md +++ b/readme/BlazorWebAssemblyApp.md @@ -69,7 +69,7 @@ The [project file](/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj) lo - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/Console.md b/readme/Console.md index cc08346c3..6f03d0e96 100644 --- a/readme/Console.md +++ b/readme/Console.md @@ -89,7 +89,7 @@ The [project file](/samples/ShroedingersCat/ShroedingersCat.csproj) looks like t - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/ConsoleNativeAOT.md b/readme/ConsoleNativeAOT.md index 4fa141f93..842dfb938 100644 --- a/readme/ConsoleNativeAOT.md +++ b/readme/ConsoleNativeAOT.md @@ -16,7 +16,7 @@ The [project file](/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.cs - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/ConsoleTopLevelStatements.md b/readme/ConsoleTopLevelStatements.md index 91a9aabed..c67937961 100644 --- a/readme/ConsoleTopLevelStatements.md +++ b/readme/ConsoleTopLevelStatements.md @@ -74,7 +74,7 @@ The [project file](/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTop - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/GrpcService.md b/readme/GrpcService.md index 8220f741d..3b7140c40 100644 --- a/readme/GrpcService.md +++ b/readme/GrpcService.md @@ -55,7 +55,7 @@ The [project file](/samples/GrpcService/GrpcService.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/Maui.md b/readme/Maui.md index 0fe88b79b..c3a690a0f 100644 --- a/readme/Maui.md +++ b/readme/Maui.md @@ -211,7 +211,7 @@ The [project file](/samples/MAUIApp/MAUIApp.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/MinimalWebAPI.md b/readme/MinimalWebAPI.md index 7f9d6f57b..688a463c8 100644 --- a/readme/MinimalWebAPI.md +++ b/readme/MinimalWebAPI.md @@ -78,7 +78,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/WebAPI.md b/readme/WebAPI.md index e6661b5ba..10fe3e6ee 100644 --- a/readme/WebAPI.md +++ b/readme/WebAPI.md @@ -53,7 +53,7 @@ The [project file](/samples/WebAPI/WebAPI.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/WebApp.md b/readme/WebApp.md index 1eed1dae6..e32c31e2c 100644 --- a/readme/WebApp.md +++ b/readme/WebApp.md @@ -53,7 +53,7 @@ The [project file](/samples/WebApp/WebApp.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/WinFormsApp.md b/readme/WinFormsApp.md index 482db49c2..1f291de4e 100644 --- a/readme/WinFormsApp.md +++ b/readme/WinFormsApp.md @@ -60,7 +60,7 @@ The [project file](/samples/WinFormsApp/WinFormsApp.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/WinFormsAppNetCore.md b/readme/WinFormsAppNetCore.md index c590a5a7d..2cbac39f7 100644 --- a/readme/WinFormsAppNetCore.md +++ b/readme/WinFormsAppNetCore.md @@ -66,7 +66,7 @@ The [project file](/samples/WinFormsAppNetCore/WinFormsAppNetCore.csproj) looks - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/readme/Wpf.md b/readme/Wpf.md index 6e50b1a23..d10ab607e 100644 --- a/readme/Wpf.md +++ b/readme/Wpf.md @@ -112,7 +112,7 @@ The [project file](/samples/WpfAppNetCore/WpfAppNetCore.csproj) looks like this: - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/samples/AvaloniaApp/AvaloniaApp.csproj b/samples/AvaloniaApp/AvaloniaApp.csproj index 12fb923cb..f53c68cc3 100644 --- a/samples/AvaloniaApp/AvaloniaApp.csproj +++ b/samples/AvaloniaApp/AvaloniaApp.csproj @@ -6,7 +6,6 @@ true app.manifest true - NU1801 diff --git a/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj b/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj index 160c61442..2ceedbbd7 100644 --- a/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj +++ b/samples/ShroedingersCatNativeAOT/ShroedingersCatNativeAOT.csproj @@ -7,7 +7,6 @@ Exe Sample false - CS8321;CA1050 diff --git a/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTopLevelStatements.csproj b/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTopLevelStatements.csproj index d4fc81af4..0f5086f9c 100644 --- a/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTopLevelStatements.csproj +++ b/samples/ShroedingersCatTopLevelStatements/ShroedingersCatTopLevelStatements.csproj @@ -4,7 +4,6 @@ $(BaseTargetFramework) Exe Sample - CS8321;CA1050 diff --git a/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj b/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj index 5698c707b..ba78ef403 100644 --- a/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj +++ b/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj @@ -6,7 +6,6 @@ true app.manifest true - NU1801 AvaloniaApp diff --git a/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj b/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj index e1219de09..ea516b59a 100644 --- a/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj +++ b/src/Pure.DI.Abstractions/Pure.DI.Abstractions.csproj @@ -7,7 +7,6 @@ $(BasePackageId).Abstractions Abstractions of $(BasePackageId). $(Description) $(DefineConstants);PUREDI_NET_ANY - NU1902;NU1903;NU3005 diff --git a/src/Pure.DI.Core/Components/Api.g.cs b/src/Pure.DI.Core/Components/Api.g.cs index 78a002dfe..7da11dc6a 100644 --- a/src/Pure.DI.Core/Components/Api.g.cs +++ b/src/Pure.DI.Core/Components/Api.g.cs @@ -1,5 +1,5 @@ // -#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1 +#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2 #pragma warning disable #if !PUREDI_API_FUNC_SUPPRESSION diff --git a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs index 5e7bdbc74..a2433b616 100644 --- a/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs +++ b/src/Pure.DI.Core/Components/GenericTypeArguments.g.cs @@ -1,5 +1,5 @@ // -#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1 +#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2 #pragma warning disable namespace Pure.DI { diff --git a/src/Pure.DI.Core/Features/Default.g.cs b/src/Pure.DI.Core/Features/Default.g.cs index 9c220f5b7..9abd4203f 100644 --- a/src/Pure.DI.Core/Features/Default.g.cs +++ b/src/Pure.DI.Core/Features/Default.g.cs @@ -1,5 +1,5 @@ // -#if !PUREDI_API_SUPPRESSION || PUREDI_API_V1 +#if !PUREDI_API_SUPPRESSION || PUREDI_API_V2 #pragma warning disable namespace Pure.DI diff --git a/src/Pure.DI.Core/Pure.DI.Core.csproj b/src/Pure.DI.Core/Pure.DI.Core.csproj index ccb232ab1..22f0cf0fd 100644 --- a/src/Pure.DI.Core/Pure.DI.Core.csproj +++ b/src/Pure.DI.Core/Pure.DI.Core.csproj @@ -3,7 +3,7 @@ netstandard2.0 $(BasePackageId) - $(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V1 + $(DefineConstants);PUREDI_API_SUPPRESSION;PUREDI_API_V2 diff --git a/src/Pure.DI.Templates/Pure.DI.Templates.csproj b/src/Pure.DI.Templates/Pure.DI.Templates.csproj index acd758c7b..c66ad5fb5 100644 --- a/src/Pure.DI.Templates/Pure.DI.Templates.csproj +++ b/src/Pure.DI.Templates/Pure.DI.Templates.csproj @@ -7,7 +7,6 @@ Pure DI project templates Pure DI Templates di;pure;ioc;templates;dotnet-new - NU5128 true false diff --git a/tests/Pure.DI.Example/Pure.DI.Example.csproj b/tests/Pure.DI.Example/Pure.DI.Example.csproj index e3d9f61c0..8f988766c 100644 --- a/tests/Pure.DI.Example/Pure.DI.Example.csproj +++ b/tests/Pure.DI.Example/Pure.DI.Example.csproj @@ -2,7 +2,6 @@ true - CS1591 Pure.DI.Integration diff --git a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj index 575ceaf32..3571c0a4e 100644 --- a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj +++ b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj @@ -4,7 +4,6 @@ true true ../../.logs - CS1591