🌐 AI搜索 & 代理 主页
Skip to content

Commit 2092165

Browse files
vmuriartvmuriart
committed
fixup! Add function of passing an arbitrary .NET object as the value of an attribute of PyObject by dynamic type
whitespace/extra changes
1 parent 21ca6e2 commit 2092165

File tree

5 files changed

+11
-22
lines changed

5 files changed

+11
-22
lines changed

‎AUTHORS.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,3 @@
4040
- ([@rico-chet](https://github.com/rico-chet))
4141
- ([@rmadsen-ks](https://github.com/rmadsen-ks))
4242
- ([@stonebig](https://github.com/stonebig))
43-
- Wenguang Yang ([@yagweb](https://github.com/yagweb))

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1313
- Added `pysetargv` (#347)
1414
- Added XML Documentation (#349)
1515
- Added Embedded tests on Appveyor (#353)
16-
-   Added PY3 settings to configuration-manager (#346)
16+
- Added PY3 settings to configuration-manager (#346)
1717
- Added function of passing an arbitrary .NET object as the value of an attribute of PyObject (#370)(#373)
1818

1919
### Changed

‎src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -30,8 +30,7 @@
3030
<DebugType>full</DebugType>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
33-
<DefineConstants Condition="'$(DefineConstants)' == ''">
34-
</DefineConstants>
33+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
3534
<Optimize>true</Optimize>
3635
<DebugType>pdbonly</DebugType>
3736
</PropertyGroup>
@@ -41,8 +40,7 @@
4140
<DebugType>full</DebugType>
4241
</PropertyGroup>
4342
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
44-
<DefineConstants Condition="'$(DefineConstants)' == ''">
45-
</DefineConstants>
43+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
4644
<Optimize>true</Optimize>
4745
<DebugType>pdbonly</DebugType>
4846
</PropertyGroup>
@@ -52,8 +50,7 @@
5250
<DebugType>full</DebugType>
5351
</PropertyGroup>
5452
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
55-
<DefineConstants Condition="'$(DefineConstants)' == ''">
56-
</DefineConstants>
53+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
5754
<Optimize>true</Optimize>
5855
<DebugType>pdbonly</DebugType>
5956
</PropertyGroup>
@@ -63,8 +60,7 @@
6360
<DebugType>full</DebugType>
6461
</PropertyGroup>
6562
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
66-
<DefineConstants Condition="'$(DefineConstants)' == ''">
67-
</DefineConstants>
63+
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
6864
<Optimize>true</Optimize>
6965
<DebugType>pdbonly</DebugType>
7066
</PropertyGroup>
@@ -106,4 +102,4 @@
106102
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
107103
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
108104
</Target>
109-
</Project>
105+
</Project>

‎src/embed_tests/dynamic.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using NUnit.Framework;
1+
using NUnit.Framework;
22
using Python.Runtime;
33
using System;
44
using System.Collections.Generic;
@@ -146,7 +146,7 @@ public outstream()
146146
public void write(String str)
147147
{
148148
this.buffer.Append(str);
149-
}
149+
}
150150
public void flush() { }
151151
public void close() { }
152152

‎src/runtime/Python.Runtime.csproj‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -69,12 +69,6 @@
6969
<Optimize>false</Optimize>
7070
<DebugType>full</DebugType>
7171
</PropertyGroup>
72-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
73-
<DefineConstants>TRACE;DEBUG;PYTHON3;PYTHON35;UCS2</DefineConstants>
74-
</PropertyGroup>
75-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x64'">
76-
<DefineConstants>TRACE;DEBUG;PYTHON3;PYTHON35;UCS2</DefineConstants>
77-
</PropertyGroup>
7872
<ItemGroup>
7973
<Reference Include="System" />
8074
</ItemGroup>
@@ -164,4 +158,4 @@
164158
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
165159
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
166160
</Target>
167-
</Project>
161+
</Project>

0 commit comments

Comments
 (0)