Manual merge, accept cs/zipslip test diff

This commit is contained in:
Josh Brown
2024-06-04 11:18:22 -07:00
parent 3b91979b14
commit e9a6ddab04
1380 changed files with 74260 additions and 56089 deletions

View File

@@ -77,6 +77,14 @@ class Generator:
self.projectNameIn, '--output', self.projectDirIn])
remove_files(self.projectDirIn, '.cs')
# Clear possibly inherited Directory.Build.props and Directory.Build.targets:
with open(os.path.join(self.workDir, 'Directory.Build.props'), 'w') as f:
f.write('<Project>\n')
f.write('</Project>\n')
with open(os.path.join(self.workDir, 'Directory.Build.targets'), 'w') as f:
f.write('<Project>\n')
f.write('</Project>\n')
def run_cmd(self, cmd, msg="Failed to run command"):
run_cmd_cwd(cmd, self.workDir, msg)