Update and cleanup dependencies

devlooped · Aug 7, 2024 · 04a6a78 · 04a6a78
1 parent a20eec3
commit 04a6a78
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 32 deletions.
diff --git a/src/CodeAnalysis/CodeAnalysis.csproj b/src/CodeAnalysis/CodeAnalysis.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Strings" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Strings" Version="1.5.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
   </ItemGroup>
 

diff --git a/src/NuGetizer.Tasks/NuGetizer.Tasks.csproj b/src/NuGetizer.Tasks/NuGetizer.Tasks.csproj
@@ -20,11 +20,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" PrivateAssets="all" />
-    <PackageReference Include="NuGet.Packaging" Version="6.9.1" PrivateAssets="all" />
+    <PackageReference Include="NuGet.Packaging" Version="6.10.1" PrivateAssets="all" />
     <PackageReference Include="NuGet.ProjectManagement" Version="4.2.0" PrivateAssets="all" />
     <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Strings" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Strings" Version="1.5.0" PrivateAssets="all" />
     <PackageReference Include="Minimatch" Version="2.0.0" PrivateAssets="all" />
   </ItemGroup>
 

diff --git a/src/NuGetizer.Tests/Builder.NuGetizer.cs b/src/NuGetizer.Tests/Builder.NuGetizer.cs
@@ -142,7 +142,7 @@ public static TargetResult BuildScenario(
         }
 
         var loggers = OpenBuildLogAttribute.IsActive || Environment.GetEnvironmentVariable("SYSTEM_DEBUG") == "true" ?
-            new ILogger[] { logger, new StructuredLogger
+            new ILogger[] { logger, new BinaryLogger
             {
                 Verbosity = LoggerVerbosity.Diagnostic,
                 Parameters = logFile
@@ -192,7 +192,7 @@ public void AssertSuccess(ITestOutputHelper output)
             if (!BuildResult.ResultsByTarget.ContainsKey(Target))
             {
                 output.WriteLine(ToString());
-                Assert.False(true, "Build results do not contain output for target " + Target);
+                Assert.Fail("Build results do not contain output for target " + Target);
             }
 
             if (ResultCode != TargetResultCode.Success)

diff --git a/src/NuGetizer.Tests/NuGetizer.Tests.csproj b/src/NuGetizer.Tests/NuGetizer.Tests.csproj
@@ -12,22 +12,20 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
-    <PackageReference Include="Microsoft.Build" Version="17.9.5" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.3.1" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build" Version="17.10.4" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.10.4" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.Build.Locator" Version="1.7.8" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.240" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.291" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <PackageReference Include="System.IO.Compression.ZipFile" Version="4.3.0" />
-    <PackageReference Include="NuGet.Packaging" Version="6.9.1" />
+    <PackageReference Include="NuGet.Packaging" Version="6.10.1" />
     <PackageReference Include="NuGet.ProjectManagement" Version="4.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.5.1" />
-    <PackageReference Include="xunit.runner.console" Version="2.8.0" />
-    <PackageReference Include="xunit.runner.msbuild" Version="2.8.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Strings" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Strings" Version="1.5.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -59,12 +57,7 @@
   </ItemGroup>
 
   <Target Name="EnsureProjectInformation" BeforeTargets="InjectThisAssemblyProject;GenerateMSBuildEditorConfigFileShouldRun" DependsOnTargets="InitializeSourceControlInformation" />
-
-  <Target Name="Test" DependsOnTargets="GetTargetPath">
-    <Exec Command="&quot;$(XunitConsolePath)&quot; &quot;$(TargetPath)&quot;" Condition="'$(UseConsole)' == 'true'" WorkingDirectory="$(MSBuildProjectDirectory)$(OutptuPath)" />
-    <xunit Assemblies="$(TargetPath)" Condition="'$(UseConsole)' != 'true'" />
-  </Target>
-
+
   <Target Name="ClearMSBuild" AfterTargets="Build">
     <ItemGroup>
       <MSBuildAssembly Include="$(OutputPath)\Microsoft.Build*.dll" Exclude="$(OutputPath)\Microsoft.Build.Locator.dll" />

diff --git a/src/dotnet-nugetize/dotnet-nugetize.csproj b/src/dotnet-nugetize/dotnet-nugetize.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    
+    <TargetFramework>net8.0</TargetFramework>
+
     <LangVersion>Latest</LangVersion>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <NuGetize>false</NuGetize>
@@ -23,14 +23,13 @@
 
   <ItemGroup>
     <PackageReference Include="Mono.Options" Version="6.12.0.148" />
-    <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
     <PackageReference Include="Spectre.Console" Version="0.49.1" />
-    <PackageReference Include="Spectre.Console.Analyzer" Version="0.49.1" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
-    <PackageReference Include="ThisAssembly.Strings" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="Spectre.Console.Analyzer" Version="1.0.0" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Project" Version="1.5.0" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Strings" Version="1.5.0" PrivateAssets="all" />
     <PackageReference Include="Devlooped.SponsorLink" Version="0.10.5" />
-    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0" />
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
   </ItemGroup>