Skip to content

Commit cf03575

Browse files
authored
Merge pull request microsoft#184 from microsoft/dev/willxie/d2m
Merge develop to master
2 parents de4ee70 + dde204a commit cf03575

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

build/CodeSign/certificate.ignore

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
1-
obj\*,Ignore Intermediates
2-
bin\*\baselines\*.xml,Ignore Test artifacts
3-
bin\*\intercept.2.0.1.tests\*, Ignore Test folder
4-
bin\*\intercept.latest.tests\*, Ignore Test folder
5-
bin\*\*.tests*.dll, Ignore Test assemblies
1+
obj\*, Ignore Intermediates
2+
3+
bin\*\instrumentationengine.lib.tests.dll, Ignore test assembly
4+
bin\*\instrumentationengine.profilerproxy.tests.dll, Ignore test assembly
5+
bin\*\instrenginetests_anycpu.dll, Ignore test assembly
6+
7+
bin\*\naglerinstrumentationmethod*, Ignore naglerInstrumentationMethod
8+
bin\*\*.xml, Ignore xml files
9+
10+
bin\*\intercept.2.0.1.tests\*, Ignore test folder
11+
bin\*\intercept.latest.tests\*, Ignore test folder
12+
bin\*\rawprofilerhook.tests\*, Ignore test folder
13+
14+
bin\*\*.wixlib, Ignore wix artifact
15+
bin\*\*.wixpdb, Ignore wix artifact
16+
bin\*\*.msidir\*.cab, Ignore embedded cab files
17+
18+
binaries-windows-release\*, Ignore downloaded binary artifacts

build/CodeSign/strongname.ignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
1-
obj\*,Ignore Intermediates
1+
obj\*, Ignore Intermediates
2+
3+
bin\*\instrenginetests_anycpu.dll, Ignore test assembly
4+
bin\*\intercept.2.0.1.tests\*, Ignore test folder
5+
bin\*\intercept.latest.tests\*, Ignore test folder
6+
bin\*\rawprofilerhook.tests\*, Ignore test folder

build/yaml/steps/microbuild/codesignverify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ steps:
1515
displayName: Verify Signed Files
1616
condition: and(succeeded(), in(variables['SignType'], 'Real', 'Test'))
1717
inputs:
18-
TargetFolder: $(Build.BinariesDirectory)
18+
TargetFolder: $(Build.StagingDirectory)
1919
WhiteListPathForCerts: 'build\CodeSign\certificate.ignore'
2020
WhiteListPathForSigs: 'build\CodeSign\strongname.ignore'

0 commit comments

Comments
 (0)