diff options
Diffstat (limited to 'tests/helixprep.proj')
| -rw-r--r-- | tests/helixprep.proj | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/helixprep.proj b/tests/helixprep.proj index ea71dbadae..91aa4861d7 100644 --- a/tests/helixprep.proj +++ b/tests/helixprep.proj @@ -1,6 +1,6 @@ <Project ToolsVersion="12.0" DefaultTargets="ArchiveAll" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net45\Microsoft.DotNet.Build.Tasks.dll"/> + <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(ToolsDir)\net46\Microsoft.DotNet.Build.Tasks.dll"/> <Import Project="dir.props" /> <Import Project="..\dir.props" /> @@ -15,7 +15,7 @@ <ItemGroup> <TestCmds Include="$(DiscoveryDirectory)\**\*.cmd" ></TestCmds> - <XunitDlls Include="$(DiscoveryDirectory)\*\*.XUnitWrapper.dll" ></XunitDlls> + <XunitDlls Include="$(DiscoveryDirectory)\**\*.XUnitWrapper.dll" ></XunitDlls> <RequiresSigningFilesToDelete Include="$(DiscoveryDirectory)\**\*.requires_signing" /> </ItemGroup> @@ -47,6 +47,7 @@ <Delete Files="@(RequiresSigningFilesToDelete)" /> <MSBuild Projects="helixprep.proj" Properties="BuildPath=%(XunitDlls.RootDir)%(XunitDlls.Directory);ProjectName=%(XunitDlls.Filename);BuildArchiveDir=$(TestWorkingDir)archive\tests\" + BuildInParallel="true" Targets="ArchiveBuild" /> </Target> @@ -114,6 +115,7 @@ EXIT /B %ERRORLEVEL% <WrapperShContents>$(WrapperShContents)for scriptFilePath in %24(find . -type f -iname '%2A.sh' ! -iname "runtests.sh" | sort)%0a</WrapperShContents> <WrapperShContents>$(WrapperShContents)do%0a</WrapperShContents> <WrapperShContents>$(WrapperShContents) perl -pi -e 's/\r\n|\n|\r/\n/g' "%24scriptFilePath"%0a</WrapperShContents> + <WrapperShContents>$(WrapperShContents) chmod +x "%24scriptFilePath"%0a</WrapperShContents> <WrapperShContents>$(WrapperShContents)done%0a</WrapperShContents> <WrapperShContents>$(WrapperShContents)%0a</WrapperShContents> <WrapperShContents>$(WrapperShContents)echo BEGIN EXECUTION%0a</WrapperShContents> |