Fixed nuget packages and unified output #263.

OsmSharp · Dec 2, 2015 · 2342456 · 2342456
1 parent 30f90e4
commit 2342456
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/OsmSharp.iOS.UI/OsmSharp.iOS.UI.csproj b/OsmSharp.iOS.UI/OsmSharp.iOS.UI.csproj
@@ -15,7 +15,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\OutputiOS\Unified\</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -24,11 +24,23 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>full</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\OutputiOS\Unified\</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator'">
+    <OutputPath>..\OutputiOS\Unified\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|iPhone'">
+    <OutputPath>..\OutputiOS\Unified\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator'">
+    <OutputPath>..\OutputiOS\Unified\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|iPhone'">
+    <OutputPath>..\OutputiOS\Unified\</OutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="OsmSharp, Version=0.0.0.48, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\OsmSharp.Core.0.0.0.48-beta\lib\Xamarin.iOS10\OsmSharp.dll</HintPath>

diff --git a/nuspec/OsmSharp.UI.nuspec b/nuspec/OsmSharp.UI.nuspec
@@ -22,14 +22,16 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="Output\Release\Any CPU\OsmSharp.UI.dll" target="lib\portable-net40+sl4+win8+wp7\OsmSharp.UI.dll" />
-        <file src="Output\Release\Any CPU\OsmSharp.UI.dll" target="lib\net40\OsmSharp.UI.dll" />
-        <file src="Output\Release\Any CPU\OsmSharp.WinForms.UI.dll" target="lib\net40\OsmSharp.WinForms.UI.dll" />
-        <file src="Output\Release\Any CPU\OsmSharp.UI.dll" target="lib\net45\OsmSharp.UI.dll" />
-        <file src="Output\Release\Any CPU\OsmSharp.WinForms.UI.dll" target="lib\net45\OsmSharp.WinForms.UI.dll" />
+      <file src="Output\Release\Any CPU\OsmSharp.UI.dll" target="lib\portable-net40+sl4+win8+wp7\OsmSharp.UI.dll" />
+      <file src="Output\Release\Any CPU\OsmSharp.UI.dll" target="lib\net40\OsmSharp.UI.dll" />
+      <file src="Output\Release\Any CPU\OsmSharp.WinForms.UI.dll" target="lib\net40\OsmSharp.WinForms.UI.dll" />
+      <file src="Output\Release\Any CPU\OsmSharp.UI.dll" target="lib\net45\OsmSharp.UI.dll" />
+      <file src="Output\Release\Any CPU\OsmSharp.WinForms.UI.dll" target="lib\net45\OsmSharp.WinForms.UI.dll" />
 	    <file src="OutputAndroid\OsmSharp.UI.dll" target="lib\MonoAndroid\OsmSharp.UI.dll" />
 	    <file src="OutputAndroid\OsmSharp.Android.UI.dll" target="lib\MonoAndroid\OsmSharp.Android.UI.dll" />
-	    <file src="OutputiOS\OsmSharp.UI.dll" target="lib\Xamarin.iOS10\OsmSharp.UI.dll" />
-	    <file src="OutputiOS\OsmSharp.iOS.UI.dll" target="lib\Xamarin.iOS10\OsmSharp.iOS.UI.dll" />
+      <file src="OutputiOS\OsmSharp.UI.dll" target="lib\MonoTouch10\OsmSharp.UI.dll" />
+      <file src="OutputiOS\OsmSharp.iOS.UI.dll" target="lib\MonoTouch10\OsmSharp.iOS.UI.dll" />
+	    <file src="OutputiOS\Unified\OsmSharp.UI.dll" target="lib\Xamarin.iOS10\OsmSharp.UI.dll" />
+	    <file src="OutputiOS\Unified\OsmSharp.iOS.UI.dll" target="lib\Xamarin.iOS10\OsmSharp.iOS.UI.dll" />
     </files>
 </package>