8000 Fixing Travis CI for mono 5.0 (#471) · KLab/pythonnet@61e7578 · GitHub
[go: up one dir, main page]
Skip to content

Commit 61e7578

Browse files
dsuarezvmanako-t
dsuarezv
authored and
manako-t
committed
Fixing Travis CI for mono 5.0 (pythonnet#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 c366416 commit 61e7578

File tree

4 files changed

+32
-76
lines changed

4 files changed

+32
-76
lines changed

‎src/embed_tests/Python.EmbeddingTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,6 @@
182182
</PropertyGroup>
183183
<Target Name="AfterBuild">
184184
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
185-
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
185+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
186186
</Target>
187187
</Project>

‎src/runtime/Python.Runtime.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,6 @@
206206
</PropertyGroup>
207207
<Target Name="AfterBuild">
208208
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
209-
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
209+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
210210
</Target>
211211
</Project>

‎src/testing/Python.Test.csproj

Lines changed: 30 additions & 74 deletions
F438
Original file line numberDiff line numberDiff line change
@@ -5,106 +5,69 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{6F401A34-273B-450F-9A4C-13550BE0767B}</ProjectGuid>
77
<OutputType>Library</OutputType>
8-
<NoStandardLibraries>false</NoStandardLibraries>
98
<AssemblyName>Python.Test</AssemblyName>
109
<RootNamespace>Python.Test</RootNamespace>
11-
<RunPostBuildEvent Condition=" '$(OS)' == 'Windows_NT'">OnBuildSuccess</RunPostBuildEvent>
10+
<DocumentationFile>bin\Python.Test.xml</DocumentationFile>
11+
<OutputPath>bin\</OutputPath>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<TargetFrameworkProfile />
14+
<NoWarn>1591,0067</NoWarn>
1415
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
15-
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
16+
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)\bin\</PythonBuildDir>
17+
<LangVersion>6</LangVersion>
18+
<SignAssembly>false</SignAssembly>
19+
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
20+
<ErrorReport>prompt</ErrorReport>
1621
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
18-
<DebugSymbols>true</DebugSymbols>
19-
<OutputPath>bin\x86\DebugMono\</OutputPath>
20-
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
21-
<DebugType>full</DebugType>
22+
<PropertyGroup Condition=" 8000 '$(Platform)' == 'x86'">
2223
<PlatformTarget>x86</PlatformTarget>
23-
<ErrorReport>prompt</ErrorReport>
24-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
25-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
26-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
2724
</PropertyGroup>
28-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x64'">
25+
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
26+
<PlatformTarget>x64</PlatformTarget>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
2929
<DebugSymbols>true</DebugSymbols>
30-
<OutputPath>bin\x64\DebugMono\</OutputPath>
3130
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
3231
<DebugType>full</DebugType>
33-
<PlatformTarget>x64</PlatformTarget>
34-
<ErrorReport>prompt</ErrorReport>
35-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
36-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
37-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
3832
</PropertyGroup>
39-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x86'& 628C quot;>
40-
<OutputPath>bin\x86\ReleaseMono\</OutputPath>
33+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
4134
<DefineConstants Condition="'$(DefineConstants)' == ''">
4235
</DefineConstants>
4336
<Optimize>true</Optimize>
4437
<DebugType>pdbonly</DebugType>
45-
<PlatformTarget>x86</PlatformTarget>
46-
<ErrorReport>prompt</ErrorReport>
47-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
48-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
49-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
5038
</PropertyGroup>
51-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
52-
<OutputPath>bin\x64\ReleaseMono\</OutputPath>
39+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
40+
<DebugSymbols>true</DebugSymbols>
41+
<DefineConstants Condition="'$(DefineConstants)' == A93C ''">DEBUG;TRACE</DefineConstants>
42+
<DebugType>full</DebugType>
43+
</PropertyGroup>
44+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
5345
<DefineConstants Condition="'$(DefineConstants)' == ''">
5446
</DefineConstants>
5547
<Optimize>true</Optimize>
5648
<DebugType>pdbonly</DebugType>
57-
<PlatformTarget>x64</PlatformTarget>
58-
<ErrorReport>prompt</ErrorReport>
59-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
60-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
61-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
6249
</PropertyGroup>
63-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
50+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
6451
<DebugSymbols>true</DebugSymbols>
65-
<OutputPath>bin\x86\DebugWin\</OutputPath>
6652
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
6753
<DebugType>full</DebugType>
68-
<PlatformTarget>x86</PlatformTarget>
69-
<ErrorReport>prompt</ErrorReport>
70-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
71-
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
72-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
73-
</PropertyGroup>
74-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
75-
<DebugSymbols>true</DebugSymbols>
76-
<OutputPath>bin\x64\DebugWin\</OutputPath>
77-
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
78-
<DebugType>full</DebugType>
79-
<PlatformTarget>x64</PlatformTarget>
80-
<ErrorReport>prompt</ErrorReport>
81-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
82-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
83-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
8454
</PropertyGroup>
85-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
86-
<OutputPath>bin\x86\ReleaseWin\</OutputPath>
55+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
8756
<DefineConstants Condition="'$(DefineConstants)' == ''">
8857
</DefineConstants>
8958
<Optimize>true</Optimize>
9059
<DebugType>pdbonly</DebugType>
91-
<PlatformTarget>x86</PlatformTarget>
92-
<ErrorReport>prompt</ErrorReport>
93-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
94-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
95-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
9660
</PropertyGroup>
97-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
98-
<OutputPath>bin\x64\ReleaseWin\</OutputPath>
61+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
62+
<DebugSymbols>true</DebugSymbols>
63+
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
64+
<DebugType>full</DebugType>
65+
</PropertyGroup>
66+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
9967
<DefineConstants Condition="'$(DefineConstants)' == ''">
10068
</DefineConstants>
10169
<Optimize>true</Optimize>
10270
<DebugType>pdbonly</DebugType>
103-
<PlatformTarget>x64</PlatformTarget>
104-
<ErrorReport>prompt</ErrorReport>
105-
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
106-
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
107-
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
10871
</PropertyGroup>
10972
<ItemGroup>
11073
<Compile Include="arraytest.cs" />
@@ -131,9 +94,6 @@
13194
<ItemGroup>
13295
<Reference Include="Microsoft.CSharp" />
13396
<Reference Include="System" />
134-
<Reference Include="System.Core">
135-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
136-
</Reference>
13797
</ItemGroup>
13898
<ItemGroup>
13999
<ProjectReference Include="..\runtime\Python.Runtime.csproj">
@@ -142,16 +102,12 @@
142102
</ProjectReference>
143103
</ItemGroup>
144104
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
145-
<ProjectExtensions>
146-
<VisualStudio AllowExistingFolder="true" />
147-
</ProjectExtensions>
148105
<PropertyGroup>
149-
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
150106
<TargetAssembly>$(TargetPath)</TargetAssembly>
151107
<TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>
152108
</PropertyGroup>
153109
<Target Name="AfterBuild">
154-
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
155-
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
110+
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(SolutionDir)\src\tests\fixtures" />
111+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
156112
</Target>
157113
</Project>

‎tools/nuget/nuget.exe

322 KB
Binary file not shown.

0 commit comments

Comments
 (0)
0