Skip to content

Commit f468908

Browse files
committed
Merge branch 'main' into topic/remove-default-string-maniplulaot
2 parents b96e38c + af279b1 commit f468908

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
directory: "/src" # Location of package manifests
1010
schedule:
1111
interval: "weekly"
12+
- package-ecosystem: "github-actions"
13+
directory: "/" # Location of package manifests
14+
schedule:
15+
interval: "weekly"

.github/workflows/MigrationToolsTelemetery.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Setup .NET SDK
21-
uses: actions/setup-dotnet@v3
21+
uses: actions/setup-dotnet@latest
2222
with:
2323
dotnet-version: ${{ env.DOTNET_CORE_VERSION }}
2424
- name: Setup .NET Core (for inproc extensions)
25-
uses: actions/setup-dotnet@v1
25+
uses: actions/setup-dotnet@latest
2626
with:
2727
dotnet-version: ${{ env.DOTNET_CORE_VERSION_INPROC }}
2828
- name: Restore

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414
- uses: actions/create-github-app-token@v1
1515
id: app-token
1616
with:

.github/workflows/main.yml

Lines changed: 8 additions & 8 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@v2
58+
uses: actions/checkout@v4
5959
with:
6060
fetch-depth: 0
6161
- name: Install GitVersion
@@ -255,19 +255,19 @@ jobs:
255255
GitVersion_MajorMinorPatch: ${{ needs.Setup.outputs.GitVersion_MajorMinorPatch }}
256256
steps:
257257
- name: Set up JDK 17
258-
uses: actions/setup-java@v3
258+
uses: actions/setup-java@v2
259259
with:
260260
java-version: 17
261261
distribution: 'zulu'
262262
- name: Checkout
263-
uses: actions/checkout@v2
263+
uses: actions/checkout@v4
264264
- uses: cschleiden/replace-tokens@v1
265265
with:
266266
files: '["**/StaticVariables.cs"]'
267267
tokenPrefix: "${"
268268
tokenSuffix: "}"
269269
- name: Setup .NET
270-
uses: actions/setup-dotnet@v1
270+
uses: actions/setup-dotnet@v4
271271
with:
272272
dotnet-version: |
273273
8.x
@@ -340,7 +340,7 @@ jobs:
340340
GitVersion_AssemblySemVer: ${{ needs.Setup.outputs.GitVersion_AssemblySemVer }}
341341
GitVersion_InformationalVersion: ${{ needs.Setup.outputs.GitVersion_InformationalVersion }}
342342
steps:
343-
- uses: actions/checkout@v3
343+
- uses: actions/checkout@v4
344344
- name: Setup Ruby
345345
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
346346
with:
@@ -475,7 +475,7 @@ jobs:
475475
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_Ring == 'Release' ) }}
476476
steps:
477477
- name: Checkout
478-
uses: actions/checkout@v2
478+
uses: actions/checkout@v4
479479
- uses: actions/download-artifact@v4
480480
- name: "Find files"
481481
shell: pwsh
@@ -528,7 +528,7 @@ jobs:
528528
if: ${{ success() && ( needs.Setup.outputs.nkdAgility_RunRelease == 'true' ) }}
529529
steps:
530530
- name: Checkout
531-
uses: actions/checkout@v2
531+
uses: actions/checkout@v4
532532
- uses: actions/download-artifact@v4
533533
- name: "Find files"
534534
shell: pwsh
@@ -558,7 +558,7 @@ jobs:
558558
run: |
559559
Get-Item -Path .\
560560
- name: SFTP Upload ${{ (needs.Setup.outputs.nkdAgility_Ring) }}
561-
uses: Dylan700/sftp-upload-action@v1.1.4
561+
uses: Dylan700/sftp-upload-action@latest
562562
with:
563563
server: nakedalmweb.sftp.wpengine.com
564564
username: nakedalmweb-learn

.github/workflows/open-pr-describer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-request:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- uses: Ant0wan/openai-pr@v1
1919
with:
2020
api-key: ${{ secrets.OPENAI_API_KEY }}

.github/workflows/opencommit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: actions/setup-node@v2
2323
with:
2424
node-version: '16'
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626
with:
2727
fetch-depth: 0
2828
- uses: di-sukharev/[email protected]

src/MigrationTools.Clients.TfsObjectModel/Tools/TfsUserMappingTool.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public void MapUserIdentityField(TfsProcessor processor, Field field)
7676
var mapps = GetMappingFileData();
7777
if (mapps != null && mapps.ContainsKey(field.Value.ToString()))
7878
{
79+
var original = field.Value;
7980
field.Value = mapps[field.Value.ToString()];
81+
Log.LogDebug($"TfsUserMappingTool::MapUserIdentityField::Map:[original|{original}][new|{field.Value}]");
8082
}
8183

8284
}

0 commit comments

Comments
 (0)