Skip to content

Commit

Permalink
Merge branch 'main' into gh-oblt/add-asciidoc-freeze-warning
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorelli25 authored Jan 28, 2025
2 parents 548933d + 6f81192 commit cd891e3
Show file tree
Hide file tree
Showing 286 changed files with 4,247 additions and 2,756 deletions.
12 changes: 0 additions & 12 deletions .ci/ci.csproj

This file was deleted.

File renamed without changes.
33 changes: 0 additions & 33 deletions .ci/docker/iis/Dockerfile

This file was deleted.

17 changes: 0 additions & 17 deletions .ci/docker/iis/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions .ci/docker/iis/content/index.html

This file was deleted.

5 changes: 0 additions & 5 deletions .ci/packer_cache.sh

This file was deleted.

83 changes: 0 additions & 83 deletions .ci/updatecli/updatecli.d/update-gherkin-specs.yml

This file was deleted.

83 changes: 0 additions & 83 deletions .ci/updatecli/updatecli.d/update-json-specs.yml

This file was deleted.

85 changes: 0 additions & 85 deletions .ci/updatecli/updatecli.d/update-specs.yml

This file was deleted.

1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-data-spec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_schema_specs_path: src/Elastic.Apm.Specification/specs
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-gherkin.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_gherkin_specs_path: test/Elastic.Apm.Feature.Tests/Features
1 change: 1 addition & 0 deletions .ci/updatecli/values.d/apm-json-specs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
apm_json_specs_path: test/Elastic.Apm.Tests.Utilities/TestResources/json-specs
10 changes: 10 additions & 0 deletions .ci/updatecli/values.d/scm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
scm:
enabled: true
owner: elastic
repository: apm-agent-dotnet
branch: main
commitusingapi: true
# begin update-compose policy values
user: obltmachine
email: obltmachine@users.noreply.github.com
# end update-compose policy values
3 changes: 3 additions & 0 deletions .ci/updatecli/values.d/update-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
spec:
files:
- "update-compose.yaml"
14 changes: 0 additions & 14 deletions .ci/updatecli/values.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/.github.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>False</IsPackable>
<ImplicitUsings>disable</ImplicitUsings>
</PropertyGroup>

</Project>
Loading

0 comments on commit cd891e3

Please sign in to comment.