Update deps

DevTeam · Oct 31, 2024 · 73e5912 · 73e5912
1 parent 4e0ed65
commit 73e5912
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 99 deletions.
diff --git a/benchmarks/Pure.DI.Benchmarks/Pure.DI.Benchmarks.csproj b/benchmarks/Pure.DI.Benchmarks/Pure.DI.Benchmarks.csproj
@@ -17,13 +17,13 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
         <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
         <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.14.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
         <PackageReference Include="IoC.Container" Version="1.3.8" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="SimpleInjector" Version="5.5.0" />
         <PackageReference Include="Unity" Version="5.11.10" />
         <PackageReference Include="DryIoc.dll" Version="5.4.3" />
-        <PackageReference Include="Autofac" Version="8.1.0" />
+        <PackageReference Include="Autofac" Version="8.1.1" />
         <PackageReference Include="LightInject" Version="6.6.4" />
         <PackageReference Include="Ninject" Version="3.3.6" />
         <PackageReference Include="Castle.Windsor" Version="6.0.0" />

diff --git a/build/CompatibilityCheckTarget.cs b/build/CompatibilityCheckTarget.cs
@@ -28,7 +28,8 @@ public async Task<IReadOnlyCollection<Package>> RunAsync(CancellationToken cance
         var libraries = await librariesTarget.RunAsync(cancellationToken);
 
         DeleteNuGetPackageFromCache("Pure.DI", settings.NextVersion, Path.GetDirectoryName(generatorPackage.Path)!);
-        await new DotNetCustom("new", "install", "Pure.DI.Templates")
+        await new DotNetNewInstall()
+            .WithPackage("Pure.DI.Templates")
             .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
         string[] frameworks =
@@ -81,47 +82,39 @@ private async Task CompatibilityCheckAsync(
         try
         {
             tempDirectory = Path.Combine(tempDirectory, "src", framework);
-            await new DotNetNew(
-                    "dilib",
-                    "-n",
-                    "MyApp",
-                    "-o",
-                    tempDirectory,
-                    "--force",
-                    "-f", framework)
-                .WithShortName($"create project from the dilib template for {framework}")
+            await new DotNetNew()
+                .WithTemplateName("dilib")
+                .WithName("MyApp")
+                .WithOutput(tempDirectory)
+                .WithForce(true)
+                .WithFramework(framework)
+                .WithShortName($"creating the project from the dilib template for {framework}")
                 .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
             await new DotNetRestore()
-                .WithShortName($"restore project for {framework}")
+                .WithShortName($"restoring the project for {framework}")
                 .WithWorkingDirectory(tempDirectory)
                 .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
             if (!framework.Contains('.'))
             {
-                await new DotNetCustom(
-                        "add",
-                        Path.Combine(tempDirectory),
-                        "package",
-                        "Microsoft.NETFramework.ReferenceAssemblies")
-                    .WithShortName($"add package Microsoft.NETFramework.ReferenceAssemblies for {framework}")
+                await new DotNetAddPackage()
+                    .WithProject(tempDirectory)
+                    .WithPackage("Microsoft.NETFramework.ReferenceAssemblies")
+                    .WithShortName($"adding the package Microsoft.NETFramework.ReferenceAssemblies for {framework}")
                     .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
             }
-
-            await new DotNetCustom(
-                    "add",
-                    Path.Combine(tempDirectory),
-                    "package",
-                    "Pure.DI",
-                    "-v",
-                    settings.NextVersion.ToString(),
-                    "-s",
-                    Path.GetDirectoryName(generatorPackage)!)
-                .WithShortName($"add the package {Path.GetFileName(generatorPackage)} for {framework}")
+
+            await new DotNetAddPackage()
+                .WithProject(tempDirectory)
+                .WithPackage("Pure.DI")
+                .WithVersion(settings.NextVersion.ToString())
+                .AddSources(Path.GetDirectoryName(generatorPackage)!)
+                .WithShortName($"adding the the package {Path.GetFileName(generatorPackage)} for {framework}")
                 .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
             await new DotNetBuild().WithWorkingDirectory(tempDirectory)
-                .WithShortName($"build sample project for {framework}")
+                .WithShortName($"building the sample project for {framework}")
                 .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
         }
         finally
@@ -144,48 +137,35 @@ private async Task CompatibilityCheckAsync(string generatorPackage, Library libr
                 Info($"Testing {library.Name} library under {framework}.");
                 var tempDirForFramework = tempDirectory + "_" + framework;
                 Directory.CreateDirectory(tempDirForFramework);
-                await new DotNetNew(
-                        templateName,
-                        "-n",
-                        "MyApp",
-                        "-o",
-                        tempDirForFramework,
-                        "--force",
-                        "-f", framework)
-                    .WithShortName($"create project from the {templateName} template for {framework}")
+                await new DotNetNew()
+                    .WithTemplateName(templateName)
+                    .WithName("MyApp")
+                    .WithOutput(tempDirForFramework)
+                    .WithFramework(framework)
+                    .WithShortName($"creating the project from the {templateName} template for {framework}")
                     .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
-                await new DotNetCustom(
-                        "add",
-                        Path.Combine(tempDirForFramework),
-                        "package",
-                        "Pure.DI",
-                        "-n",
-                        "-v",
-                        settings.NextVersion.ToString(),
-                        "-f",
-                        framework,
-                        "-s",
-                        Path.GetDirectoryName(generatorPackage)!)
-                    .WithShortName($"add package {Path.GetFileName(generatorPackage)} for the {templateName} template for {framework}")
+                await new DotNetAddPackage()
+                    .WithProject(tempDirForFramework)
+                    .WithPackage("Pure.DI")
+                    .WithNoRestore(true)
+                    .WithVersion(settings.NextVersion.ToString())
+                    .AddSources(Path.GetDirectoryName(generatorPackage)!)
+                    .WithFramework(framework)
+                    .WithShortName($"addong the package {Path.GetFileName(generatorPackage)} for the {templateName} template for {framework}")
                     .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
                 var libraryPackageDir = Path.GetDirectoryName(library.Package.Path)!;
                 DeleteNuGetPackageFromCache(library.Name, settings.NextVersion, libraryPackageDir);
-
-                await new DotNetCustom(
-                        "add",
-                        Path.Combine(tempDirForFramework),
-                        "package",
-                        library.Name,
-                        "-n",
-                        "-v",
-                        settings.NextVersion.ToString(),
-                        "-s",
-                        libraryPackageDir,
-                        "-f",
-                        framework)
-                    .WithShortName($"add package {library.Name} for the {templateName} template for {framework}")
+
+                await new DotNetAddPackage()
+                    .WithProject(tempDirForFramework)
+                    .WithPackage(library.Name)
+                    .WithNoRestore(true)
+                    .WithVersion(settings.NextVersion.ToString())
+                    .AddSources(libraryPackageDir)
+                    .WithFramework(framework)
+                    .WithShortName($"adding the package {library.Name} for the {templateName} template for {framework}")
                     .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
 
                 await new DotNetRestore()
@@ -198,7 +178,7 @@ private async Task CompatibilityCheckAsync(string generatorPackage, Library libr
                 await new DotNetBuild()
                     .WithWorkingDirectory(tempDirForFramework)
                     .WithNoRestore(true)
-                    .WithShortName($"build for the {templateName} template for {framework}")
+                    .WithShortName($"building the {templateName} template for {framework}")
                     .RunAsync(cancellationToken: cancellationToken).EnsureSuccess();
             }
         }

diff --git a/build/DeployTarget.cs b/build/DeployTarget.cs
@@ -23,9 +23,9 @@ public async Task<int> RunAsync(CancellationToken cancellationToken)
         foreach (var package in packages.Where(i => i.Deploy))
         {
             await new DotNetNuGetPush()
-                .WithSources("https://api.nuget.org/v3/index.json")
+                .WithSource("https://api.nuget.org/v3/index.json")
                 .WithPackage(package.Path).WithApiKey(settings.NuGetKey)
-                .WithShortName($"pushing {package.Path}")
+                .WithShortName($"pushing the package {package.Path}")
                 .BuildAsync(cancellationToken: cancellationToken).EnsureSuccess();
         }
 

diff --git a/build/TemplateTarget.cs b/build/TemplateTarget.cs
@@ -52,7 +52,7 @@ public async Task<string> RunAsync(CancellationToken cancellationToken)
 
         await new DotNetNuGetPush()
             .WithPackage(targetPackage)
-            .WithSources("https://api.nuget.org/v3/index.json")
+            .WithSource("https://api.nuget.org/v3/index.json")
             .WithApiKey(settings.NuGetKey)
             .BuildAsync(cancellationToken: cancellationToken).EnsureSuccess();
 

diff --git a/build/build.csproj b/build/build.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CSharpInteractive" Version="1.1.1" />
+        <PackageReference Include="CSharpInteractive" Version="1.1.2" />
         <PackageReference Include="Pure.DI" Version="$(InternalVersion)">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/AvaloniaApp/AvaloniaApp.csproj b/samples/AvaloniaApp/AvaloniaApp.csproj
@@ -14,12 +14,12 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\Clock\Clock.csproj"/>
-        <PackageReference Include="Avalonia" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
+        <PackageReference Include="Avalonia" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/AvaloniaSimpleApp/AvaloniaSimpleApp.csproj b/samples/AvaloniaSimpleApp/AvaloniaSimpleApp.csproj
@@ -11,11 +11,11 @@
     <ItemGroup>
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
-        <PackageReference Include="Avalonia" Version="11.1.0"/>
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.0"/>
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0"/>
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0"/>
+        <PackageReference Include="Avalonia" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0"/>
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
     </ItemGroup>
 </Project>
diff --git a/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj b/samples/BlazorWebAssemblyApp/BlazorWebAssemblyApp.csproj
@@ -10,8 +10,8 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/Clock.Tests/Clock.Tests.csproj b/samples/Clock.Tests/Clock.Tests.csproj
@@ -9,7 +9,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
-        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/GrpcService/GrpcService.csproj b/samples/GrpcService/GrpcService.csproj
@@ -9,7 +9,7 @@
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
         <Protobuf Include="Protos\greet.proto" GrpcServices="Server"/>
-        <PackageReference Include="Grpc.AspNetCore" Version="2.65.0" />
+        <PackageReference Include="Grpc.AspNetCore" Version="2.66.0" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj b/samples/SingleRootAvaloniaApp/SingleRootAvaloniaApp.csproj
@@ -15,12 +15,12 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\Clock\Clock.csproj"/>
-        <PackageReference Include="Avalonia" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
-        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
+        <PackageReference Include="Avalonia" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.0" />
+        <PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.0" />
         <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.3" />
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.2.0" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/WeatherForecast/WeatherForecast.csproj b/samples/WeatherForecast/WeatherForecast.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     </ItemGroup>
 
 </Project>
diff --git a/samples/WebAPI/WebAPI.csproj b/samples/WebAPI/WebAPI.csproj
@@ -9,8 +9,8 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <ProjectReference Include="..\..\src\Pure.DI\Pure.DI.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
         <Compile Include="..\..\src\Pure.DI.MS\any\Pure.DI\MS\*.cs" Link=""/>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.8" />
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.7.3" />
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.10" />
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Pure.DI.MS/Pure.DI.MS.csproj b/src/Pure.DI.MS/Pure.DI.MS.csproj
@@ -19,7 +19,7 @@
             <Pack>true</Pack>
             <PackagePath>contentFiles/cs</PackagePath>
         </Compile>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj b/tests/Pure.DI.IntegrationTests/Pure.DI.IntegrationTests.csproj
@@ -7,7 +7,7 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Pure.DI.Tests/Pure.DI.Tests.csproj b/tests/Pure.DI.Tests/Pure.DI.Tests.csproj
@@ -4,7 +4,7 @@
         <ProjectReference Include="..\..\src\Pure.DI.Core\Pure.DI.Core.csproj"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
-        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj b/tests/Pure.DI.UsageTests/Pure.DI.UsageTests.csproj
@@ -17,8 +17,8 @@
         <PackageReference Include="Castle.Core" Version="5.1.1"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
         <PackageReference Include="Shouldly" Version="4.2.1"/>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
-        <PackageReference Include="xunit" Version="2.9.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+        <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>