aboutsummaryrefslogtreecommitdiffstatsci
diff options
context:
space:
mode:
authorjpbruyere <jp.bruyere@hotmail.com>2016-07-19 04:29:42 +0200
committerjpbruyere <jp.bruyere@hotmail.com>2016-07-19 04:29:42 +0200
commitd742b1402b8ebe49f825d90cc69dca7c65591072 (patch)
treee107085c332d197f7b4271b6da85b0771a134e90
parent496e19c23586a349ade7eb82f4bca29ee05986ba (diff)
nuget restore test
-rw-r--r--Crow.csproj22
-rw-r--r--OTKCrow/OTKCrow.csproj10
2 files changed, 9 insertions, 23 deletions
diff --git a/Crow.csproj b/Crow.csproj
index d9d49339..b38adbf4 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -32,15 +32,11 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<DefineConstants>DEBUG_FOCUS0;DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
<Optimize>false</Optimize>
- <IntermediateOutputPath>build\obj\Debug</IntermediateOutputPath>
- <OutputPath>build\Debug</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>True</Optimize>
<DebugType>None</DebugType>
<DefineConstants>__linux__;MEASURE_TIME</DefineConstants>
- <IntermediateOutputPath>build\obj\Release</IntermediateOutputPath>
- <OutputPath>build\Release</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="src\Colors.cs" />
@@ -145,24 +141,20 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Drawing" />
<Reference Include="cairo-sharp">
- <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath>
- <Package>gtk-sharp-3.0</Package>
+ <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath>
</Reference>
<Reference Include="gdk-sharp">
- <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gdk-sharp.dll</HintPath>
- <Package>gtk-sharp-2.0</Package>
+ <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gdk-sharp.dll</HintPath>
</Reference>
<Reference Include="gio-sharp">
- <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gio-sharp.dll</HintPath>
- <Package>gio-sharp-3.0</Package>
+ <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\gio-sharp.dll</HintPath>
</Reference>
<Reference Include="glib-sharp">
- <HintPath>..\..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\glib-sharp.dll</HintPath>
- <Package>glib-sharp-3.0</Package>
+ <HintPath>packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\glib-sharp.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="..\..\packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets" Condition="Exists('..\..\packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets')" />
+ <Import Project="packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets" Condition="Exists('packages\gtk-sharp.Linux.3.14.3.14.7\build\net40\gtk-sharp.Linux.3.14.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -234,9 +226,7 @@
<EmbeddedResource Include="Templates\ScrollBar.goml" />
<EmbeddedResource Include="Templates\Button.crow" />
<EmbeddedResource Include="Templates\ArrowButTemplate.crow" />
- <EmbeddedResource Include="Images\crow0.svg">
- <LogicalName>Crow.image.crow0.svg</LogicalName>
- </EmbeddedResource>
+ <EmbeddedResource Include="Images\crow0.svg"/>
<EmbeddedResource Include="Templates\TreeView.crow" />
<EmbeddedResource Include="Templates\TabItem.crow" />
<EmbeddedResource Include="Templates\TreeItem.crow" />
diff --git a/OTKCrow/OTKCrow.csproj b/OTKCrow/OTKCrow.csproj
index bd5f22eb..5e7b71c3 100644
--- a/OTKCrow/OTKCrow.csproj
+++ b/OTKCrow/OTKCrow.csproj
@@ -22,8 +22,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
- <IntermediateOutputPath>$(SolutionDir)\build\obj\$(Configuration)</IntermediateOutputPath>
- <OutputPath>$(SolutionDir)\build\$(Configuration)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
@@ -31,8 +29,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
- <IntermediateOutputPath>$(SolutionDir)\build\obj\$(Configuration)</IntermediateOutputPath>
- <OutputPath>$(SolutionDir)\build\$(Configuration)</OutputPath>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
@@ -40,12 +36,12 @@
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="System.Drawing" />
- <Reference Include="cairo-sharp, Version=1.10.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
- <Package>gtk-sharp-3.0</Package>
- </Reference>
<Reference Include="OpenTK">
<HintPath>..\packages\OpenTK.1.1.2349.61993\lib\NET40\OpenTK.dll</HintPath>
</Reference>
+ <Reference Include="cairo-sharp">
+ <HintPath>..\packages\gtk-sharp.Linux.3.14.3.14.7\lib\net40\cairo-sharp.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="OpenTKGameWindow.cs" />