Skip to content

Commit d9a3666

Browse files
dsuarezvdenfromufa
authored and
denfromufa
committed
Fixing Travis CI for mono 5.0 (#471)
* Fixing setup.py with mono 5.0 * Go back to xbuild * Trying to figure out the error cause. Apparently xbuild cannot process the Copy section of the pdb file in the projects. I have commented them out for now, but this is not a real soltion since they are needed in debug versions. Just to se if it fixes the CI.
1 parent cc48374 commit d9a3666

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ def build_extension(self, ext):
209209
'pythonnet.sln',
210210
'/p:Configuration={}'.format(_config),
211211
'/p:Platform={}'.format(ARCH),
212-
'/p:DefineConstants="{}"'.format(','.join(defines)),
212+
'/p:DefineConstants="{}"'.format('%3B'.join(defines)),
213213
'/p:PythonBuildDir="{}"'.format(os.path.abspath(dest_dir)),
214214
'/p:PythonInteropFile="{}"'.format(os.path.basename(interop_file)),
215215
'/verbosity:{}'.format(VERBOSITY),

src/embed_tests/Python.EmbeddingTest.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,6 @@
115115
</PropertyGroup>
116116
<Target Name="AfterBuild">
117117
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
118-
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
118+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
119119
</Target>
120120
</Project>

src/runtime/Python.Runtime.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,6 @@
161161
</PropertyGroup>
162162
<Target Name="AfterBuild">
163163
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
164-
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
164+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
165165
</Target>
166166
</Project>

src/testing/Python.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@
108108
</PropertyGroup>
109109
<Target Name="AfterBuild">
110110
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(SolutionDir)\src\tests\fixtures" />
111-
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
111+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
112112
</Target>
113113
</Project>

tools/nuget/nuget.exe

322 KB
Binary file not shown.

0 commit comments

Comments
 (0)