From ea77a5276294cefb1998f5eda634cdaa0344cba1 Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 4 Sep 2024 08:38:49 +0100 Subject: [PATCH 1/3] Update to check where these missing files are! --- .github/workflows/main.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45f13f356..ecc80cc15 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -279,6 +279,17 @@ jobs: - run: dotnet build MigrationTools.sln /p:Version=${{ env.GitVersion_SemVer }} /p:FileVersion=${{ env.GitVersion_AssemblySemVer }} /p:InformationalVersion=${{ env.GitVersion_InformationalVersion }} /p:GitVersionTag=${{ env.GitVersion_PreReleaseLabel }} name: Build MigrationTools.sln id: Build + - name: "Check that required files exist!" + shell: pwsh + run: | + $foundFiles = Get-ChildItem -Path .\ -Recurse -Filter '*WITDataStore64*' | ForEach-Object { $_.FullName } + if ($foundFiles -eq $null) { + Write-Output "No WITDataStore64 found" + exit 1 + } else { + Write-Output "Found WITDataStore64" + } + - run: dotnet tool install --global dotnet-sonarscanner - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory=L0|TestCategory=L1)" - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory=L2|TestCategory=L3)" - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory!=L0&TestCategory!=L1&TestCategory!=L2&TestCategory!=L3)" From bafb2485ee0926f0443ede89e1e0204fc50f8aae Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 4 Sep 2024 08:45:13 +0100 Subject: [PATCH 2/3] Update to output the files --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ecc80cc15..214161e47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -289,6 +289,7 @@ jobs: } else { Write-Output "Found WITDataStore64" } + $foundFiles - run: dotnet tool install --global dotnet-sonarscanner - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory=L0|TestCategory=L1)" - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory=L2|TestCategory=L3)" From f559363c6cec91ca01797baf7be57a30a0c93c1d Mon Sep 17 00:00:00 2001 From: "Martin Hinshelwood nkdAgility.com" Date: Wed, 4 Sep 2024 08:57:37 +0100 Subject: [PATCH 3/3] Added check and updated refs! --- build/packageExecutable.ps1 | 20 +++++++++++++++++++ docs/Reference/Generated/MigrationTools.xml | 20 +++++++++---------- .../MigrationTools.ConsoleFull.csproj | 1 + 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/build/packageExecutable.ps1 b/build/packageExecutable.ps1 index 01f2d4e8c..bad48adaa 100644 --- a/build/packageExecutable.ps1 +++ b/build/packageExecutable.ps1 @@ -75,12 +75,32 @@ New-Item -Path $outfolder -Name "/MigrationTools/" -ItemType Directory New-Item -Path $outfolder -Name "/MigrationTools/preview/" -ItemType Directory New-Item -Path $outfolder -Name "/MigrationTools/ConfigSamples/" -ItemType Directory Write-Output "----------------------------------------" +Write-Output "Validating Contents of ./src/MigrationTools.ConsoleFull/bin/Debug/net472/*" +$foundFiles = Get-ChildItem -Path "./src/MigrationTools.ConsoleFull/bin/Debug/net472/" -Recurse -Filter '*WITDataStore*' | ForEach-Object { $_.FullName } +if ($foundFiles -eq $null) { + Write-Output "No WITDataStore found" + exit 1 +} else { + Write-Output "Found WITDataStore" +} +$foundFiles +Write-Output "----------------------------------------" # Copy Files Write-Output "Copy files to $outfolder/MigrationTools/" Copy-Item -Path "./src/MigrationTools.ConsoleFull/bin/Debug/net472/*" -Destination "$outfolder/MigrationTools/" -Recurse Copy-Item -Path "./src/MigrationTools.ConsoleCore/bin/Debug/net8.0/*" -Destination "$outfolder/MigrationTools/preview/" -Recurse Copy-Item -Path "./src/MigrationTools.Samples/*" -Destination "$outfolder/MigrationTools/ConfigSamples/" -Recurse Write-Output "----------------------------------------" +Write-Output "Validating Contents of $outfolder/MigrationTools/" +$foundFiles = Get-ChildItem -Path "$outfolder/MigrationTools/" -Recurse -Filter '*WITDataStore*' | ForEach-Object { $_.FullName } +if ($foundFiles -eq $null) { + Write-Output "No WITDataStore found" + exit 1 +} else { + Write-Output "Found WITDataStore" +} +$foundFiles +Write-Output "----------------------------------------" # Create Zip 7z a -tzip $OutputFullName $outfolder/MigrationTools/** Write-Output "----------------------------------------" diff --git a/docs/Reference/Generated/MigrationTools.xml b/docs/Reference/Generated/MigrationTools.xml index 852c1ecc6..30eecbc1c 100644 --- a/docs/Reference/Generated/MigrationTools.xml +++ b/docs/Reference/Generated/MigrationTools.xml @@ -258,37 +258,37 @@ - => @"topic/enable-upgrade-telemetery" + => @"fix/WITDataStore64-missing" - => @"9da18171" + => @"bafb2485" - => @"9da18171b9a1938f37b1bf62e4ac8a7e63e2706e" + => @"bafb2485ee0926f0443ede89e1e0204fc50f8aae" - => @"2024-09-03T15:15:23+01:00" + => @"2024-09-04T08:45:13+01:00" - => @"7" + => @"2" - => @"v16.0.0-Preview.6-7-g9da18171" + => @"v16.0.0-Preview.7-2-gbafb2485" - => @"v16.0.0-Preview.6" + => @"v16.0.0-Preview.7" @@ -318,17 +318,17 @@ - => @"7" + => @"2" - => @"Preview.6" + => @"Preview.7" - => @"-Preview.6" + => @"-Preview.7" diff --git a/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj b/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj index 491f6744c..7a638402e 100644 --- a/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj +++ b/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj @@ -49,6 +49,7 @@ +