Skip to content

Commit cfc6d6a

Browse files
authored
chore: Clean up .gitignore and .gitattributes files (#2879)
Clean up gitignore and gitattributes files
1 parent 0278836 commit cfc6d6a

File tree

4 files changed

+13
-583
lines changed

4 files changed

+13
-583
lines changed

.gitattributes

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ MSVBDPCADLL binary
1919
*.chm binary
2020
*.xpi binary
2121

22-
# For docker-for-Windows-based build/testing, force some files to be checkout out with Linux-style line endings
22+
# For docker-for-Windows-based build/testing, force some files to be checked out with Linux-style line endings
2323
*.sh text eol=lf
24-
/Agent/packaging/test/applications/custom_xml/*.xml text eol=lf
25-
/Agent/packaging/redhat/newrelic-dotnetagent.spec text eol=lf
24+
/build/Linux/test/applications/custom_xml/*.xml text eol=lf
25+
/build/Linux/build/rpm/newrelic-dotnetagent.spec text eol=lf
2626

.gitignore

+10-108
Original file line numberDiff line numberDiff line change
@@ -17,151 +17,53 @@
1717

1818
*.tlog
1919

20-
#NCrunch
21-
_NCrunch_*/
22-
*.ncrunchsolution
23-
*.ncrunchsolution.user
24-
*.ncrunchproject
25-
*.ncrunchproject.user
26-
27-
# NuGet package files
28-
Agent/NewRelic/Tray/packages/
29-
Agent/packages/
30-
PerformanceTests/packages/
31-
PhantomJSTests/packages/
32-
3320
# Version Files
3421
VersionAssemblyInfo.cs
3522

36-
# Misc build artifacts
37-
3823
# Build output
3924
bin/
4025
obj/
41-
*.ipch
42-
*.idl
43-
*.tlb
44-
*.mrg.h
45-
UpgradeLog.htm
46-
47-
# Development stuff
48-
*.swp
49-
tags
50-
FILES
51-
junk
52-
*.out
53-
*.jmconfig
54-
Agent/.vs/config/applicationhost.config
5526

5627
# Windows image thumbnail cache file
5728
Thumbs.db
5829

59-
# NDepends utility
60-
NDependOut/
61-
*.ndproj
62-
6330
*.pidb
6431

65-
test-results
66-
6732
#ignore launchSettings
6833
launchSettings.json
6934

7035
# Ignore FullAgent build output
7136
src/_build/
72-
Agent/_build/
73-
Build/_staging
74-
Build/BuildArtifacts
7537

7638
# Build tools should be saved in full, even if they match ignore patterns.
77-
!Agent/BuildTools/*
78-
!Agent/BuildTools/SignTool/*
79-
80-
# External libraries should be saved in full, even if they match ignore patterns.
81-
!Agent/ExternalLibs/*
39+
!/build/Tools/*
8240

83-
# Don't save any of the logs in NewRelicHome
84-
Agent/NewRelicHome/Logs/*
85-
86-
# Ignore C++ generated source files.
87-
Agent/NewRelic.Agent.IL/_NewRelic.Agent.IL.idl
88-
Agent/NewRelic.Agent.IL/_NewRelic.Agent.IL.tlb
89-
90-
# Ignore build output files copied to New Relic Home x86/x64
41+
# Ignore home dirs
9142
newrelichome_*
92-
src/Agent/New Relic Home*
93-
94-
# Ignore New Relic Home generated registry files
95-
src/Agent/New Relic Home x86.reg
96-
src/Agent/New Relic Home x64.reg
97-
98-
# Ignore generated version files
99-
Agent/NewRelic.Agent.IL/NewRelicCoreVersion.h
100-
Agent/Shared/SharedAssemblyInfoVersion.cs
101-
Agent/NewRelic/Profiler/Profiler/VersionInfo.h
10243

103-
Agent/NewRelic/Profiler/Profiler/test-results
104-
105-
# Ignore source files generated during build
106-
Agent/Installer/Core.wxs
107-
Agent/NewRelic/Agent/Core/AgentInstallConfiguration_Generated.cs
108-
109-
# Ignore license reviewer output files
110-
LicenseData/license_errors.txt
111-
112-
# Sample apps
113-
App_Data
114-
115-
#Functional Tests
116-
FunctionalTests/InstallUtil.InstallLog
117-
*.coverage
118-
TestResults/*
119-
*.pubxml.user
44+
# Integration Tests
12045
tests/Agent/IntegrationTests/Applications/*/Deploy/
12146
tests/Agent/IntegrationTests/SharedApplications/*/Deploy/
12247
tests/Agent/IntegrationTests/UnboundedApplications/*/Deploy/
12348
tests/Agent/IntegrationTests/.vs/config/applicationhost.config
12449
.DS_Store
125-
Agent/UpgradeLog*.htm
126-
127-
#PlatformTests
128-
tests/Agent/PlatformTests/packages/
129-
tests/Agent/PlatformTests/Applications/ServiceFabricApplication/packages/
130-
tests/Agent/PlatformTests/Applications/ServiceFabricApplication/ServiceFabricApplication/pkg
131-
tests/Agent/PlatformTests/Applications/WindowsContainerApplication/packages
132-
tests/Agent/PlatformTests/Applications/NetFrameworkBasicApplication/packages
133-
134-
/Tests/Benchmarking/BenchmarkDotNet.Artifacts
135-
*.dgml
136-
137-
#SmokeTest
138-
tests/Agent/SmokeTest/logs/
139-
tests/Agent/SmokeTest/agent/
140-
141-
# Include built binaries so that building the profiler is not necessary when only doing managed agent work
142-
# The Home Builder picks up profiler binaries from this location
143-
src/Agent/_profilerBuild/**/*.exp
144-
src/Agent/_profilerBuild/**/*.iobj
145-
src/Agent/_profilerBuild/**/*.ipdb
146-
src/Agent/_profilerBuild/**/*.lib
147-
src/Agent/_profilerBuild/**/*.pdb
148-
src/Agent/NewRelic/Profiler/out/build/x64-Debug/VSInheritEnvironments.txt
149-
150-
# Ignore any locally built profiler Debug-mode binaries
50+
51+
# Local profiler build artificats
15152
src/Agent/_profilerBuild/*Debug
53+
src/Agent/NewRelic/Profiler/Profiler/VersionInfo.h
15254

15355
# Ignore any signing keys used in Linux packaging
15456
build/Linux/keys
15557

156-
tests/TestResults/*
157-
15858
# ignore profiler binaries - they're now pulled from a NuGet package (see Home.csproj)
15959
/src/Agent/_profilerBuild/linux-arm64-release/libNewRelicProfiler.so
16060
/src/Agent/_profilerBuild/linux-x64-release/libNewRelicProfiler.so
16161
/src/Agent/_profilerBuild/x64-Release/NewRelic.Profiler.dll
16262
/src/Agent/_profilerBuild/x86-Release/NewRelic.Profiler.dll
163-
/tests/Agent/IntegrationTests/ContainerApplications/.env
16463

165-
/tests/Agent/IntegrationTests/LocalStack/volume
64+
# ignore Docker environment files
16665
*.env
66+
67+
# Container Integration Tests
68+
/tests/Agent/IntegrationTests/LocalStack/volume
16769
/tests/Agent/IntegrationTests/ContainerApplications/volume/cache

src/Agent/NewRelic/Profiler/.gitignore

-208
This file was deleted.

0 commit comments

Comments
 (0)