Skip to content

Commit f81f161

Browse files
johannedinjohannedin
authored
Merge branch 'main' into fixGetImageFormat
2 parents a7b5b22 + 29aaddf commit f81f161

File tree

5 files changed

+45
-48
lines changed

5 files changed

+45
-48
lines changed

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
nkdAgility_AzureSitesEnvironment: ${{ steps.nkdagility.outputs.AzureSitesEnvironment }}
5656
steps:
5757
- name: Checkout
58-
uses: actions/checkout@v4
58+
uses: actions/checkout@v5
5959
with:
6060
fetch-depth: 0
6161
- name: "Fix contibutions if main"
@@ -291,7 +291,7 @@ jobs:
291291
292292
Write-Output "-------------------------------------------"
293293
Write-Output "::endgroup::"
294-
- uses: actions/upload-artifact@v4
294+
- uses: actions/upload-artifact@v5
295295
with:
296296
name: AzureDevOpsMigrationTools-Scripts
297297
path: ./build/**
@@ -372,7 +372,7 @@ jobs:
372372
java-version: 17
373373
distribution: "zulu"
374374
- name: Checkout
375-
uses: actions/checkout@v4
375+
uses: actions/checkout@v5
376376
- uses: cschleiden/replace-tokens@v1
377377
with:
378378
files: '["**/StaticVariables.cs"]'
@@ -441,11 +441,11 @@ jobs:
441441
if: ${{ steps.Build.outcome == 'success' }}
442442
run: |
443443
Get-ChildItem -Path ./staging/ -Recurse | ForEach-Object { $_.FullName }
444-
- uses: actions/upload-artifact@v4
444+
- uses: actions/upload-artifact@v5
445445
with:
446446
name: AzureDevOpsMigrationTools-Packages
447447
path: ./staging/**
448-
- uses: actions/upload-artifact@v4
448+
- uses: actions/upload-artifact@v5
449449
with:
450450
name: AzureDevOpsMigrationTools-Generated
451451
path: ./docs/Reference/Generated/**
@@ -461,7 +461,7 @@ jobs:
461461
GitVersion_AssemblySemVer: ${{ needs.Setup.outputs.GitVersion_AssemblySemVer }}
462462
GitVersion_InformationalVersion: ${{ needs.Setup.outputs.GitVersion_InformationalVersion }}
463463
steps:
464-
- uses: actions/checkout@v4
464+
- uses: actions/checkout@v5
465465
- uses: cschleiden/replace-tokens@v1
466466
with:
467467
files: '["**/*.html", "**/*.yaml", "**/*.yml", "**/*.json"]'
@@ -487,7 +487,7 @@ jobs:
487487
$configFiles = "hugo.yaml,hugo.$environment.yaml"
488488
Write-Host "Using config files: $configFiles"
489489
hugo --source docs --config $configFiles --logLevel debug;
490-
- uses: actions/upload-artifact@v4
490+
- uses: actions/upload-artifact@v5
491491
with:
492492
name: AzureDevOpsMigrationTools-Site2
493493
path: ./public/**/*
@@ -507,10 +507,10 @@ jobs:
507507
# Release app when RunRelease is true (ForceRelease OR src changed)
508508
if: ${{ success() && needs.Setup.outputs.nkdAgility_RunRelease == 'true' }}
509509
steps:
510-
- uses: actions/download-artifact@v4
510+
- uses: actions/download-artifact@v6
511511
with:
512512
name: AzureDevOpsMigrationTools-Packages
513-
- uses: actions/download-artifact@v4
513+
- uses: actions/download-artifact@v6
514514
with:
515515
name: AzureDevOpsMigrationTools-Scripts
516516
path: ./build/
@@ -591,8 +591,8 @@ jobs:
591591
if: ${{ success() && needs.Setup.outputs.nkdAgility_RunRelease == 'true' && needs.Setup.outputs.nkdAgility_Ring == 'Production' }}
592592
steps:
593593
- name: Checkout
594-
uses: actions/checkout@v4
595-
- uses: actions/download-artifact@v4
594+
uses: actions/checkout@v5
595+
- uses: actions/download-artifact@v6
596596
- name: "Find files"
597597
shell: pwsh
598598
run: |
@@ -619,7 +619,7 @@ jobs:
619619
# Only when app was released
620620
if: ${{ success() && needs.Setup.outputs.nkdAgility_RunRelease == 'true' }}
621621
steps:
622-
- uses: actions/download-artifact@v4
622+
- uses: actions/download-artifact@v6
623623
with:
624624
name: AzureDevOpsMigrationTools-Packages
625625
- name: "Choco"
@@ -644,8 +644,8 @@ jobs:
644644
if: ${{ success() && needs.Setup.outputs.nkdAgility_RunRelease == 'true' }}
645645
steps:
646646
- name: Checkout
647-
uses: actions/checkout@v4
648-
- uses: actions/download-artifact@v4
647+
uses: actions/checkout@v5
648+
- uses: actions/download-artifact@v6
649649
- name: "Find files"
650650
shell: pwsh
651651
run: |
@@ -666,7 +666,7 @@ jobs:
666666
if: ${{ !(github.event.pull_request.head.repo.fork) }}
667667
steps:
668668
- name: Download a single artifact
669-
uses: actions/download-artifact@v4
669+
uses: actions/download-artifact@v6
670670
with:
671671
name: AzureDevOpsMigrationTools-Site2
672672
path: ./_site2

‎Directory.Packages.props‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
3+
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.4.0" />
44
<PackageVersion Include="Ben.Demystifier" Version="0.4.1" />
55
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
66
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
7-
<PackageVersion Include="Elmah.Io.Client" Version="5.2.118" />
8-
<PackageVersion Include="GitInfo" Version="3.5.0" />
7+
<PackageVersion Include="Elmah.Io.Client" Version="5.3.131" />
8+
<PackageVersion Include="GitInfo" Version="3.6.0" />
99
<PackageVersion Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
1010
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
11-
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
11+
<PackageVersion Include="Microsoft.Azure.Functions.Worker" Version="2.2.0" />
1212
<PackageVersion Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.0.0" />
1313
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
14-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.1" />
15-
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.2" />
16-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
14+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.1.0" />
15+
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.5" />
16+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.10" />
1717
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
18-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
1919
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
20-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.10" />
2121
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
22-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
23-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
24-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
22+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
23+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
24+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.10" />
2525
<PackageVersion Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="5.3.0" />
26-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
26+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
2727
<PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.Common.Contracts" Version="19.225.1" />
2828
<PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
2929
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
3030
<PackageVersion Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="19.225.1" />
3131
<PackageVersion Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
3232
<PackageVersion Include="Microsoft.VisualStudio.Services.ServiceEndpoints.WebApi" Version="19.225.1" />
33-
<PackageVersion Include="MSTest.TestAdapter" Version="3.8.3" />
34-
<PackageVersion Include="MSTest.TestFramework" Version="3.8.3" />
33+
<PackageVersion Include="MSTest.TestAdapter" Version="4.0.1" />
34+
<PackageVersion Include="MSTest.TestFramework" Version="4.0.1" />
3535
<PackageVersion Include="ncalc" Version="1.3.8" />
36-
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
36+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
3737
<PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
38-
<PackageVersion Include="NuGet.Protocol" Version="6.13.2" />
39-
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.12.0" />
40-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
41-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
38+
<PackageVersion Include="NuGet.Protocol" Version="6.14.0" />
39+
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.13.1" />
40+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
41+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
4242
<PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.6" />
43-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
43+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.13.0" />
4444
<PackageVersion Include="OxyPlot.Core" Version="2.2.0" />
4545
<PackageVersion Include="OxyPlot.ImageSharp" Version="2.2.0" />
46-
<PackageVersion Include="Riok.Mapperly" Version="4.2.1" />
46+
<PackageVersion Include="Riok.Mapperly" Version="4.3.0" />
4747
<PackageVersion Include="Serilog" Version="4.2.0" />
4848
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1" />
4949
<PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0" />
@@ -60,7 +60,7 @@
6060
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
6161
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
6262
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
63-
<PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
63+
<PackageVersion Include="System.Drawing.Common" Version="9.0.10" />
6464
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
6565
<PackageVersion Include="TfsUrlParser" Version="1.5.0" />
6666
<PackageVersion Include="WGet.NET" Version="4.4.1" />

‎src/MigrationTools.Host/Commands/CommandBase.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public sealed override async Task<int> ExecuteAsync(CommandContext context, TSet
6565
{
6666
Log.Debug("Disabling Telemetry {CommandName}", this.GetType().Name);
6767
CommandActivity.AddTag("DisableTelemetry", settings.DisableTelemetry);
68-
CommandActivity.Stop();
6968
ActivitySourceProvider.DisableActivitySource();
7069
}
7170
//Enable Debug Trace
@@ -105,7 +104,7 @@ public sealed override async Task<int> ExecuteAsync(CommandContext context, TSet
105104

106105
internal virtual Task<int> ExecuteInternalAsync(CommandContext context, TSettings settings)
107106
{
108-
return Task.FromResult( 0);
107+
return Task.FromResult(0);
109108
}
110109

111110
public void RunStartupLogic(TSettings settings)

‎src/MigrationTools.Tests/Tools/FieldMaps/FieldCalculationMapTests.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using Microsoft.VisualStudio.TestTools.UnitTesting;
44
using MigrationTools.Tools;
@@ -117,7 +117,7 @@ public void NCalcExpression_InvalidExpression_ShouldThrowException()
117117
var expression = new Expression("[x] + ["); // Invalid syntax
118118

119119
// Act & Assert - NCalc throws EvaluationException for invalid syntax
120-
Assert.ThrowsException<NCalc.EvaluationException>(() => expression.Evaluate());
120+
Assert.Throws<NCalc.EvaluationException>(() => expression.Evaluate());
121121
}
122122

123123
[TestMethod]
@@ -127,7 +127,7 @@ public void NCalcExpression_UndefinedVariable_ShouldThrowException()
127127
var expression = new Expression("[undefined] * 2");
128128

129129
// Act & Assert
130-
Assert.ThrowsException<ArgumentException>(() => expression.Evaluate());
130+
Assert.Throws<ArgumentException>(() => expression.Evaluate());
131131
}
132132
}
133-
}
133+
}

‎src/MigrationTools/Processors/Infrastructure/Processor.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel.Design;
43
using System.Diagnostics;
54
using System.Linq;
65
using Microsoft.Extensions.DependencyInjection;
76
using Microsoft.Extensions.Logging;
87
using Microsoft.Extensions.Options;
9-
using MigrationTools._EngineV1.Configuration;
108
using MigrationTools.Endpoints;
11-
using MigrationTools.Endpoints.Infrastructure;
129
using MigrationTools.Enrichers;
1310
using MigrationTools.Exceptions;
1411
using MigrationTools.Services;
@@ -139,6 +136,7 @@ public void Execute()
139136
}
140137
finally
141138
{
139+
ProcessorActivity.Stop();
142140
Log.LogInformation("{ProcessorName} completed in {ProcessorDuration} ", Name, ProcessorActivity.Duration.ToString("c"));
143141
}
144142

@@ -172,4 +170,4 @@ protected static void AddParameter(string name, IDictionary<string, string> stor
172170
if (!store.ContainsKey(name)) store.Add(name, value);
173171
}
174172
}
175-
}
173+
}

0 commit comments

Comments
 (0)