F2calv/2024 11 dotnet9 + dependencies (#237)

* nuget updates * dotnet 9 target added * debug wf * revert
f2calv · Nov 19, 2024 · e50af1f · e50af1f
1 parent 5f54b9d
commit e50af1f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/src/CasCap.Apis.AzureDevOps.Tests/CasCap.Apis.AzureDevOps.Tests.csproj b/src/CasCap.Apis.AzureDevOps.Tests/CasCap.Apis.AzureDevOps.Tests.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <None Update="appsettings.Test.json" CopyToOutputDirectory="Always" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CasCap.Common.Testing" Version="4.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="xunit" Version="2.9.0" />
+    <PackageReference Include="CasCap.Common.Testing" Version="4.2.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.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/src/CasCap.Apis.AzureDevOps/CasCap.Apis.AzureDevOps.csproj b/src/CasCap.Apis.AzureDevOps/CasCap.Apis.AzureDevOps.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <!--<Nullable>enable</Nullable>-->
   </PropertyGroup>
 
@@ -12,16 +12,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.36" />
-    <PackageReference Include="CasCap.Common.Extensions" Version="4.0.2" />
-    <PackageReference Include="CasCap.Common.Net" Version="4.0.2" />
+    <PackageReference Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.39" />
+    <PackageReference Include="CasCap.Common.Extensions" Version="4.2.2" />
+    <PackageReference Include="CasCap.Common.Net" Version="4.2.2" />
     <PackageReference Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
     <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
     <PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
     <PackageReference Include="Microsoft.VisualStudio.Services.Release.Client" Version="19.225.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="semver" Version="2.3.0" />
-    <PackageReference Include="YamlDotNet" Version="16.0.0" />
+    <PackageReference Include="semver" Version="3.0.0" />
+    <PackageReference Include="YamlDotNet" Version="16.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CasCap.Apis.AzureDevOps/Utilities/YamlPipelineGenerator.cs b/src/CasCap.Apis.AzureDevOps/Utilities/YamlPipelineGenerator.cs
@@ -274,7 +274,7 @@ List<Step> GenSteps(Guid Id, string displayName, string semver, IDictionary<stri
         string condition, bool continueOnError, int timeoutInMinutes, Dictionary<string, string> parameters = null)
     {
         var version = SemVersion.Parse(semver.Replace(".*", ".0"), SemVersionStyles.OptionalPatch).Major;
-        if (_taskMap.TryGetValue(Id, out var taskObjs) && taskObjs.TryGetValue(version, out var taskObj))
+        if (_taskMap.TryGetValue(Id, out var taskObjs) && taskObjs.TryGetValue((int)version, out var taskObj))
             return new List<Step>
             {
                 new Step
@@ -294,7 +294,7 @@ List<Step> GenSteps(Guid Id, string displayName, string semver, IDictionary<stri
 
         Template GetOrCreateTaskGroupTemplate()
         {
-            var key = new TaskGroupVersion(Id, version);
+            var key = new TaskGroupVersion(Id, (int)version);
             if (_taskGroupTemplateMap.TryGetValue(key, out var template))
                 return template;
             else

diff --git a/src/CasCap.DevOpsYamlizrCli/CasCap.DevOpsYamlizrCli.csproj b/src/CasCap.DevOpsYamlizrCli/CasCap.DevOpsYamlizrCli.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <AssemblyName>yamlizr</AssemblyName>
   </PropertyGroup>
 
@@ -14,12 +14,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ConsoleTables" Version="2.6.1" />
+    <PackageReference Include="ConsoleTables" Version="2.6.2" />
     <PackageReference Include="Figgle" Version="0.5.1" />
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
     <PackageReference Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
     <PackageReference Include="ShellProgressBar" Version="5.2.0" />
   </ItemGroup>