Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# fix incorrect Roff programming language tag in github repo
*.man -linguist-language
#*.man linguist-language=xml
manifests/**/* linguist-vendored=true
6 changes: 3 additions & 3 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: windows-latest
steps:
- name: checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: environment
shell: cmd
Expand Down Expand Up @@ -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 }}
Expand All @@ -88,7 +88,7 @@ jobs:

steps:
- name: checkout
uses: actions/checkout@v1
uses: actions/checkout@v4

- name: environment
shell: cmd
Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 0 additions & 10 deletions NuGet.config

This file was deleted.

11 changes: 8 additions & 3 deletions scripts/dotnet-build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)) {
Expand Down
3 changes: 3 additions & 0 deletions scripts/post-build-events.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
24 changes: 12 additions & 12 deletions src/CollectSFData/CollectSFData.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@
<dependencies>
<group targetFramework=".NETFramework4.6.2">
<dependency id="Azure.Data.Tables" version="12.8.1" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.0" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.4" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Secrets" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Blobs" version="12.18.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Queues" version="12.16.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Azure.Kusto.Data" version="11.3.4" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.CodeDom" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="7.0.2" exclude="Build,Analyzers" />
Expand All @@ -38,15 +38,15 @@
</group>
<group targetFramework=".NETFramework4.8.0">
<dependency id="Azure.Data.Tables" version="12.8.1" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.0" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.4" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Secrets" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Blobs" version="12.18.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Queues" version="12.16.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Azure.Kusto.Data" version="11.3.4" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.CodeDom" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="7.0.2" exclude="Build,Analyzers" />
Expand All @@ -56,15 +56,15 @@
</group>
<group targetFramework=".net6.0">
<dependency id="Azure.Data.Tables" version="12.8.1" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.0" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.4" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Secrets" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Blobs" version="12.18.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Queues" version="12.16.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Azure.Kusto.Data" version="11.3.4" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.CodeDom" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="7.0.2" exclude="Build,Analyzers" />
Expand All @@ -73,15 +73,15 @@
</group>
<group targetFramework=".net8.0">
<dependency id="Azure.Data.Tables" version="12.8.1" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.0" exclude="Build,Analyzers" />
<dependency id="Azure.Identity" version="1.11.4" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Keys" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Security.KeyVault.Secrets" version="4.5.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Blobs" version="12.18.0" exclude="Build,Analyzers" />
<dependency id="Azure.Storage.Queues" version="12.16.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Azure.Kusto.Data" version="11.3.4" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.60.1" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Microsoft.Identity.Client.Extensions.Msal" version="4.61.3" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.3" exclude="Build,Analyzers" />
<dependency id="System.CodeDom" version="4.7.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="7.0.2" exclude="Build,Analyzers" />
Expand Down
4 changes: 2 additions & 2 deletions src/CollectSFDataDll/Azure/BlobManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public void DownloadFiles(string[] uris)

public List<BlobClient> 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<BlobClient> blobItems = new List<BlobClient>();
Expand Down Expand Up @@ -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)));
}

Expand Down
6 changes: 3 additions & 3 deletions src/CollectSFDataDll/CollectSFDataDll.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
<Version>1.1.1</Version>
</PackageReference>
<PackageReference Include="Azure.Identity">
<Version>1.11.0</Version>
<Version>1.11.4</Version>
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Client">
<Version>4.60.1</Version>
<Version>4.61.3</Version>
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal">
<Version>4.60.1</Version>
<Version>4.61.3</Version>
<TreatAsUsed>true</TreatAsUsed>
</PackageReference>
<PackageReference Include="System.CodeDom">
Expand Down
3 changes: 2 additions & 1 deletion src/CollectSFDataDll/Collector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,8 @@ private List<string> GetFilesWithNecessaryExtension(List<string> files, string l

default:
Log.Warning($"configured filetype:{Config.FileType} not valid for cache upload. returning.");
return null;

break;
}
return files;
}
Expand Down
1 change: 1 addition & 0 deletions src/CollectSFDataDll/DataFile/FileManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ public FileObjectCollection PopulateCollection<T>(FileObject fileObject) where T
FileObjectCollection collection = new FileObjectCollection() { fileObject };
_instance.TotalFilesFormatted++;
_instance.TotalRecords += fileObject.RecordCount;
fileObject.Status = FileStatus.formatted;

if (_config.IsKustoConfigured())
{
Expand Down
9 changes: 5 additions & 4 deletions src/CollectSFDataDll/DataFile/FileObjectStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Loading