Merge branch 'main' into update-dotnet-version-for-zeroconfig-windows…

…-test
signalfx · Mar 6, 2025 · 4ad5bc5 · 4ad5bc5
2 parents 140f3b1 + e99f1da
commit 4ad5bc5
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 598 deletions.
diff --git a/packaging/dotnet-instr-deployer-add-on/.gitignore b/packaging/dotnet-instr-deployer-add-on/.gitignore
diff --git a/packaging/dotnet-instr-deployer-add-on/Makefile b/packaging/dotnet-instr-deployer-add-on/Makefile
diff --git a/packaging/dotnet-instr-deployer-add-on/README.md b/packaging/dotnet-instr-deployer-add-on/README.md
diff --git a/packaging/dotnet-instr-deployer-add-on/assets/README/inputs.conf.spec b/packaging/dotnet-instr-deployer-add-on/assets/README/inputs.conf.spec
diff --git a/packaging/dotnet-instr-deployer-add-on/assets/default/app.conf b/packaging/dotnet-instr-deployer-add-on/assets/default/app.conf
diff --git a/packaging/dotnet-instr-deployer-add-on/assets/default/inputs.conf b/packaging/dotnet-instr-deployer-add-on/assets/default/inputs.conf
diff --git a/packaging/dotnet-instr-deployer-add-on/assets/static/appIcon.png b/packaging/dotnet-instr-deployer-add-on/assets/static/appIcon.png
diff --git a/packaging/dotnet-instr-deployer-add-on/assets/static/appIcon_2x.png b/packaging/dotnet-instr-deployer-add-on/assets/static/appIcon_2x.png
diff --git a/packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin/installer-wrapper.ps1 b/packaging/dotnet-instr-deployer-add-on/assets/windows_x86_64/bin/installer-wrapper.ps1
diff --git a/packaging/dotnet-instr-deployer-add-on/cmd/splunk_otel_dotnet_deployer/deployer_windows.go b/packaging/dotnet-instr-deployer-add-on/cmd/splunk_otel_dotnet_deployer/deployer_windows.go