diff --git a/.gitattributes b/.gitattributes index cdbbcf3b..778a3eba 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ # fix incorrect Roff programming language tag in github repo -*.man -linguist-language -#*.man linguist-language=xml \ No newline at end of file +manifests/**/* linguist-vendored=true diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0ac2d7da..3b7c9b7e 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -24,7 +24,7 @@ jobs: runs-on: windows-latest steps: - name: checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: environment shell: cmd @@ -73,7 +73,7 @@ jobs: run: dir "$($env:artifacts_path)" -recurse - name: upload artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: name: Release path: ${{ env.artifacts_path }} @@ -88,7 +88,7 @@ jobs: steps: - name: checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: environment shell: cmd diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cd5fed1..ab3f4939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ # Change log +## 08/20/2025 + +- fix deprecated GitHub Actions: upgrade upload-artifact from v1 to v4 and checkout from v1 to v4 +- update GitHub Actions dependency: bump actions/download-artifact from 1 to 4.1.7 in /.github/workflows +- fix incorrect Roff programming language tag in github repo + +## 01/31/2025 + +- dependency vulnerabilities updates for .NET 8.0 target framework +- add log when collection is finished +- remove nuget.config management from script +- add prefix in logging output + +## 11/27/2024 + +- fix NullReferenceException in Collector.UploadCacheData() method +- remove deprecated Azure DevOps artifacts feed +- add 'formatted' as a file status + +## 09/03/2024 + +- update GitHub Actions workflow dependencies for security compliance + +## 08/12/2024 v3.0.2408.11213 + +- release version 3.0.2408.11213 + ## 08/11/2024 - (vchin) add support for 'LocalPath' ingestion into kusto emulator for testing diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index 4f79d5ef..00000000 --- a/NuGet.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/scripts/dotnet-build.ps1 b/scripts/dotnet-build.ps1 index ef7a349d..c9aafa37 100644 --- a/scripts/dotnet-build.ps1 +++ b/scripts/dotnet-build.ps1 @@ -60,7 +60,7 @@ function main() { $csproj = create-tempProject -projectFile $csproj $dllcsproj = create-tempProject -projectFile $dllcsproj $nuspecFile = create-nuspec $targetFrameworks - rename-nugetConfig + # rename-nugetConfig $error.Clear() write-host "dotnet restore $csproj" -ForegroundColor Green @@ -119,8 +119,13 @@ function build-configuration($configuration) { dotnet publish $csproj -f $targetFrameworks -r $runtimeIdentifier -c $configuration --self-contained $true -p:PublishSingleFile=true -p:PublishedTrimmed=true } - $nugetFile = "$projectDir/bin/$configuration/*.nupkg" - $nugetFile = (resolve-path $nugetFile)[-1] + write-host "searching for nupkg in $projectDir/bin/$configuration/*.nupkg" -ForegroundColor Green + $nugetFile = @(get-childItem "$projectDir/bin/$configuration/*.nupkg") + write-host "nugetFile results: $($nugetFile | out-string)" -ForegroundColor Green + if (!$nugetFile) { + return + } + $nugetFile = (resolve-path $nugetFile)[-1].FullName $nugetFunctions = "$pwd/nuget-functions.ps1" if ((test-path $nugetFile)) { diff --git a/scripts/post-build-events.ps1 b/scripts/post-build-events.ps1 index 8b60bbb6..f1e92695 100644 --- a/scripts/post-build-events.ps1 +++ b/scripts/post-build-events.ps1 @@ -60,6 +60,9 @@ function main() { write-host "copying default options file $defaultOptionsFile" Copy-Item $defaultOptionsFile $outDir } + + write-host "finished post-build-event.ps1" + return 0 } main \ No newline at end of file diff --git a/src/CollectSFData/CollectSFData.nuspec b/src/CollectSFData/CollectSFData.nuspec index a865aba9..ebe91821 100644 --- a/src/CollectSFData/CollectSFData.nuspec +++ b/src/CollectSFData/CollectSFData.nuspec @@ -21,15 +21,15 @@ - + - - + + @@ -38,15 +38,15 @@ - + - - + + @@ -56,15 +56,15 @@ - + - - + + @@ -73,15 +73,15 @@ - + - - + + diff --git a/src/CollectSFDataDll/Azure/BlobManager.cs b/src/CollectSFDataDll/Azure/BlobManager.cs index 1c9136c4..ad86df27 100644 --- a/src/CollectSFDataDll/Azure/BlobManager.cs +++ b/src/CollectSFDataDll/Azure/BlobManager.cs @@ -170,7 +170,7 @@ public void DownloadFiles(string[] uris) public List EnumerateContainerBlobPages(BlobContainerClient containerClient, string prefix = "") { - Log.Info($"enter containerUri: {containerClient.Name}"); + Log.Info($"enter containerUri: {containerClient.Name} prefix: {prefix}"); string continuationToken = ""; bool moreResultsAvailable = true; List blobItems = new List(); @@ -253,7 +253,7 @@ private void DownloadBlobsFromContainer(BlobContainerClient containerClient) private void DownloadBlobsFromDirectory(BlobContainerClient containerDirectory, string prefix = "") { - Log.Info($"enumerating:{containerDirectory}", ConsoleColor.Cyan); + Log.Info($"enumerating:{containerDirectory.Name} prefix:{prefix}", ConsoleColor.Cyan); _blobTasks.QueueTaskAction(() => QueueBlobSegmentDownload(EnumerateContainerBlobPages(containerDirectory, prefix))); } diff --git a/src/CollectSFDataDll/CollectSFDataDll.csproj b/src/CollectSFDataDll/CollectSFDataDll.csproj index 81f738e9..3ea8890f 100644 --- a/src/CollectSFDataDll/CollectSFDataDll.csproj +++ b/src/CollectSFDataDll/CollectSFDataDll.csproj @@ -53,15 +53,15 @@ 1.1.1 - 1.11.0 + 1.11.4 true - 4.60.1 + 4.61.3 true - 4.60.1 + 4.61.3 true diff --git a/src/CollectSFDataDll/Collector.cs b/src/CollectSFDataDll/Collector.cs index d8a3758c..37d41447 100644 --- a/src/CollectSFDataDll/Collector.cs +++ b/src/CollectSFDataDll/Collector.cs @@ -546,7 +546,8 @@ private List GetFilesWithNecessaryExtension(List files, string l default: Log.Warning($"configured filetype:{Config.FileType} not valid for cache upload. returning."); - return null; + + break; } return files; } diff --git a/src/CollectSFDataDll/DataFile/FileManager.cs b/src/CollectSFDataDll/DataFile/FileManager.cs index e0c7d86d..142604f4 100644 --- a/src/CollectSFDataDll/DataFile/FileManager.cs +++ b/src/CollectSFDataDll/DataFile/FileManager.cs @@ -230,6 +230,7 @@ public FileObjectCollection PopulateCollection(FileObject fileObject) where T FileObjectCollection collection = new FileObjectCollection() { fileObject }; _instance.TotalFilesFormatted++; _instance.TotalRecords += fileObject.RecordCount; + fileObject.Status = FileStatus.formatted; if (_config.IsKustoConfigured()) { diff --git a/src/CollectSFDataDll/DataFile/FileObjectStatus.cs b/src/CollectSFDataDll/DataFile/FileObjectStatus.cs index 5dfc3e62..9eca345f 100644 --- a/src/CollectSFDataDll/DataFile/FileObjectStatus.cs +++ b/src/CollectSFDataDll/DataFile/FileObjectStatus.cs @@ -16,9 +16,10 @@ public enum FileStatus queued = 4, downloading = 8, formatting = 16, - uploading = 32, - failed = 64, - succeeded = 128, - all = 256 + formatted = 32, + uploading = 64, + failed = 128, + succeeded = 256, + all = 512 } } \ No newline at end of file