Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
reverting changes to runtime and clrmodule projects
  • Loading branch information
sigbjorn committed Jul 4, 2016
commit 9e1d72b213de710f525dcad3d59d6167fc2f6884
1 change: 0 additions & 1 deletion src/clrmodule/clrmodule.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@
<CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
<DefineConstants>PYTHON35,UCS2</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="RGiesecke.DllExport.Metadata">
Expand Down
20 changes: 9 additions & 11 deletions src/runtime/Python.Runtime.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
<OutputPath>bin\x86\ReleaseMono\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON35, UCS4</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON27, UCS4</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<DefineConstants>PYTHON35,UCS2</DefineConstants>
<DefineConstants>PYTHON27,UCS2</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
<OutputPath>bin\x64\ReleaseMono\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON35, UCS4</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON27, UCS4</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
Expand All @@ -34,7 +34,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
<OutputPath>bin\x86\ReleaseWin\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON35, UCS2</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON27, UCS2</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
Expand All @@ -44,19 +44,18 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
<OutputPath>bin\x64\ReleaseWin\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON35, UCS2</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON27, UCS2</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<CodeAnalysisIgnoreBuiltInRuleSets>false</CodeAnalysisIgnoreBuiltInRuleSets>
<CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
<DefineConstants>PYTHON35,UCS2</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\DebugMono\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON35,UCS4</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON27,UCS4</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
Expand All @@ -68,7 +67,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\DebugMono\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON35,UCS4</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON27,UCS4</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
Expand All @@ -77,7 +76,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\DebugWin\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON35,UCS2</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON27,UCS2</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
Expand All @@ -89,12 +88,11 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\DebugWin\</OutputPath>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON35,UCS2</DefineConstants>
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON27,UCS2</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Optimize>false</Optimize>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<DefineConstants>TRACE;DEBUG;PYTHON35,UCS2</DefineConstants>
</PropertyGroup>
<Choose>
<When Condition=" '$(Configuration)'=='DebugMono' ">
Expand Down