Merge pull request MvvmCross#309 from kjeremy/fix-solution

Fix the solution. Get the build going again.
martijn00 · Oct 27, 2016 · 259e1b8 · 259e1b8
2 parents 4a6ac82 + b539c67
commit 259e1b8
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 23 deletions.
diff --git a/MvvmCross.Droid.Support.Design/MvvmCross.Droid.Support.Design.csproj b/MvvmCross.Droid.Support.Design/MvvmCross.Droid.Support.Design.csproj
@@ -130,7 +130,6 @@
       <SubType>Designer</SubType>
     </AndroidResource>
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
@@ -142,7 +141,6 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Import Project="..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Vector.Drawable.24.2.1\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

diff --git a/MvvmCross.Droid.Support.V7.RecyclerView/MvvmCross.Droid.Support.V7.RecyclerView.csproj b/MvvmCross.Droid.Support.V7.RecyclerView/MvvmCross.Droid.Support.V7.RecyclerView.csproj
@@ -80,18 +80,6 @@
       <HintPath>..\packages\Xamarin.Android.Support.Core.UI.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Xamarin.Android.Support.Core.Utils, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Core.Utils.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Core.Utils.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Fragment, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Fragment.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Fragment.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Xamarin.Android.Support.Media.Compat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.Media.Compat.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.Media.Compat.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Xamarin.Android.Support.v7.RecyclerView.24.2.1\lib\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
       <Private>True</Private>

diff --git a/MvvmCross.Droid.Support.V7.RecyclerView/packages.config b/MvvmCross.Droid.Support.V7.RecyclerView/packages.config
@@ -5,8 +5,5 @@
   <package id="MvvmCross.Platform" version="4.3.0" targetFramework="monoandroid60" />
   <package id="Xamarin.Android.Support.Compat" version="24.2.1" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.Core.UI" version="24.2.1" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.Core.Utils" version="24.2.1" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.Fragment" version="24.2.1" targetFramework="monoandroid70" />
-  <package id="Xamarin.Android.Support.Media.Compat" version="24.2.1" targetFramework="monoandroid70" />
   <package id="Xamarin.Android.Support.v7.RecyclerView" version="24.2.1" targetFramework="monoandroid70" />
 </packages>
diff --git a/MvvmCross_DroidSupport.sln b/MvvmCross_DroidSupport.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.V7.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.V7.AppCompat", "MvvmCross.Droid.Support.V7.AppCompat\MvvmCross.Droid.Support.V7.AppCompat.csproj", "{911D9032-EA82-41B9-80D7-5DB84951B6E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.V4", "MvvmCross.Droid.Support.V4\MvvmCross.Droid.Support.V4.csproj", "{24C19002-AD02-4B88-9E57-1C254819D30E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.V17.Leanback", "MvvmCross.Droid.Support.V17.Leanback\MvvmCross.Droid.Support.V17.Leanback.csproj", "{FFC83AE3-D1FB-4A7B-974E-72697235E047}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.V14.Preference", "MvvmCross.Droid.Support.V14.Preference\MvvmCross.Droid.Support.V14.Preference.csproj", "{9C110DA1-7CF0-4919-B6E7-A25B16D6DB7F}"
@@ -17,18 +15,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Des
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuspec", "nuspec", "{22132440-48FD-462E-8075-DFB1D5C09827}"
 	ProjectSection(SolutionItems) = preProject
+		nuspec\MvvmCross.Droid.Support.Core.UI.nuspec = nuspec\MvvmCross.Droid.Support.Core.UI.nuspec
+		nuspec\MvvmCross.Droid.Support.Core.Util.nuspec = nuspec\MvvmCross.Droid.Support.Core.Util.nuspec
 		nuspec\MvvmCross.Droid.Support.Design.nuspec = nuspec\MvvmCross.Droid.Support.Design.nuspec
+		nuspec\MvvmCross.Droid.Support.Fragment.nuspec = nuspec\MvvmCross.Droid.Support.Fragment.nuspec
 		nuspec\MvvmCross.Droid.Support.V14.Preference.nuspec = nuspec\MvvmCross.Droid.Support.V14.Preference.nuspec
 		nuspec\MvvmCross.Droid.Support.V17.Leanback.nuspec = nuspec\MvvmCross.Droid.Support.V17.Leanback.nuspec
 		nuspec\MvvmCross.Droid.Support.V4.nuspec = nuspec\MvvmCross.Droid.Support.V4.nuspec
 		nuspec\MvvmCross.Droid.Support.V7.AppCompat.nuspec = nuspec\MvvmCross.Droid.Support.V7.AppCompat.nuspec
+		nuspec\MvvmCross.Droid.Support.V7.Fragging.nuspec = nuspec\MvvmCross.Droid.Support.V7.Fragging.nuspec
 		nuspec\MvvmCross.Droid.Support.V7.Preference.nuspec = nuspec\MvvmCross.Droid.Support.V7.Preference.nuspec
 		nuspec\MvvmCross.Droid.Support.V7.RecyclerView.nuspec = nuspec\MvvmCross.Droid.Support.V7.RecyclerView.nuspec
 		nuspec\pack.bat = nuspec\pack.bat
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.V7.Preference", "MvvmCross.Droid.Support.V7.Preference\MvvmCross.Droid.Support.V7.Preference.csproj", "{C6DA15E8-A377-40BE-970F-E2681C79BB34}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Compat", "MvvmCross.Droid.Support.Compat\MvvmCross.Droid.Support.Compat.csproj", "{EA8563C7-102B-41D4-AF04-4C92B1DDD132}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Core.UI", "MvvmCross.Droid.Support.Core.UI\MvvmCross.Droid.Support.Core.UI.csproj", "{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Core.Utils", "MvvmCross.Droid.Support.Core.Utils\MvvmCross.Droid.Support.Core.Utils.csproj", "{61C1EB25-483E-4C77-89CD-CA202C82C6BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Fragment", "MvvmCross.Droid.Support.Fragment\MvvmCross.Droid.Support.Fragment.csproj", "{FC0B3E3C-8B00-48FA-AF93-981A45B2BE4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvvmCross.Droid.Support.Media.Compat", "MvvmCross.Droid.Support.Media.Compat\MvvmCross.Droid.Support.Media.Compat.csproj", "{240A1627-FBB5-4CDD-94D3-545E13FF0AD9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +55,6 @@ Global
 		{911D9032-EA82-41B9-80D7-5DB84951B6E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{911D9032-EA82-41B9-80D7-5DB84951B6E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{911D9032-EA82-41B9-80D7-5DB84951B6E5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{24C19002-AD02-4B88-9E57-1C254819D30E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{24C19002-AD02-4B88-9E57-1C254819D30E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{24C19002-AD02-4B88-9E57-1C254819D30E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{24C19002-AD02-4B88-9E57-1C254819D30E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FFC83AE3-D1FB-4A7B-974E-72697235E047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FFC83AE3-D1FB-4A7B-974E-72697235E047}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FFC83AE3-D1FB-4A7B-974E-72697235E047}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -63,6 +71,26 @@ Global
 		{C6DA15E8-A377-40BE-970F-E2681C79BB34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6DA15E8-A377-40BE-970F-E2681C79BB34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6DA15E8-A377-40BE-970F-E2681C79BB34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA8563C7-102B-41D4-AF04-4C92B1DDD132}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA68B924-17C4-41F7-9B02-53C0DE9B8D4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61C1EB25-483E-4C77-89CD-CA202C82C6BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61C1EB25-483E-4C77-89CD-CA202C82C6BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61C1EB25-483E-4C77-89CD-CA202C82C6BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61C1EB25-483E-4C77-89CD-CA202C82C6BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FC0B3E3C-8B00-48FA-AF93-981A45B2BE4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FC0B3E3C-8B00-48FA-AF93-981A45B2BE4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FC0B3E3C-8B00-48FA-AF93-981A45B2BE4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FC0B3E3C-8B00-48FA-AF93-981A45B2BE4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{240A1627-FBB5-4CDD-94D3-545E13FF0AD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{240A1627-FBB5-4CDD-94D3-545E13FF0AD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{240A1627-FBB5-4CDD-94D3-545E13FF0AD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{240A1627-FBB5-4CDD-94D3-545E13FF0AD9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE