Pārlūkot izejas kodu

Update nugets and iOS 9 Compat

James Montemagno 10 gadi atpakaļ
vecāks
revīzija
298a6e7e62

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 417 - 384
Demos/TwitterSearch/TwitterSearch.Droid/Resources/Resource.Designer.cs


+ 14 - 12
Demos/TwitterSearch/TwitterSearch.Droid/TwitterSearch.Droid.csproj

@@ -60,11 +60,13 @@
     </Reference>
     <Reference Include="Mono.Android" />
     <Reference Include="mscorlib" />
-    <Reference Include="Refractored.Xam.TTS">
-      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.1\lib\MonoAndroid10\Refractored.Xam.TTS.dll</HintPath>
+    <Reference Include="Refractored.Xam.TTS, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.5\lib\MonoAndroid10\Refractored.Xam.TTS.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Refractored.Xam.TTS.Abstractions">
-      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.1\lib\MonoAndroid10\Refractored.Xam.TTS.Abstractions.dll</HintPath>
+    <Reference Include="Refractored.Xam.TTS.Abstractions, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.5\lib\MonoAndroid10\Refractored.Xam.TTS.Abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -97,11 +99,11 @@
       <HintPath>..\Components\urlimageviewhelper-1.0.4\lib\android\UrlImageViewHelper.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.v4.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Android.Support.v4.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.22.1.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+      <HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.0.1.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -140,12 +142,6 @@
     <AndroidResource Include="Resources\drawable-hdpi\icon.png" />
     <AndroidResource Include="Resources\values-v21\styles.xml" />
   </ItemGroup>
-  <ItemGroup>
-    <XamarinComponentReference Include="urlimageviewhelper">
-      <Visible>False</Visible>
-      <Version>1.0.4</Version>
-    </XamarinComponentReference>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\menu\" />
   </ItemGroup>
@@ -155,6 +151,12 @@
       <Name>TwitterSearch.Portable</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <XamarinComponentReference Include="urlimageviewhelper">
+      <Visible>False</Visible>
+      <Version>1.0.4.1</Version>
+    </XamarinComponentReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 3 - 3
Demos/TwitterSearch/TwitterSearch.Droid/packages.config

@@ -10,7 +10,7 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="MonoAndroid50" />
   <package id="Rx-Main" version="2.2.5" targetFramework="MonoAndroid50" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="MonoAndroid50" />
-  <package id="Xam.Plugins.TextToSpeech" version="1.0.1" targetFramework="MonoAndroid50" />
-  <package id="Xamarin.Android.Support.v4" version="22.1.1.1" targetFramework="MonoAndroid50" />
-  <package id="Xamarin.Android.Support.v7.AppCompat" version="22.1.1.1" targetFramework="MonoAndroid50" />
+  <package id="Xam.Plugins.TextToSpeech" version="1.0.5" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.v4" version="23.0.1.1" targetFramework="MonoAndroid50" />
+  <package id="Xamarin.Android.Support.v7.AppCompat" version="23.0.1.1" targetFramework="MonoAndroid50" />
 </packages>

+ 6 - 4
Demos/TwitterSearch/TwitterSearch.Portable/TwitterSearch.Portable.csproj

@@ -46,11 +46,13 @@
     <Reference Include="LinqToTwitterPcl">
       <HintPath>..\packages\LinqToTwitter.3.1.2\lib\portable-win8+net45+wp8\LinqToTwitterPcl.dll</HintPath>
     </Reference>
-    <Reference Include="Refractored.Xam.TTS">
-      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Refractored.Xam.TTS.dll</HintPath>
+    <Reference Include="Refractored.Xam.TTS, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.5\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Refractored.Xam.TTS.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Refractored.Xam.TTS.Abstractions">
-      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.1\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Refractored.Xam.TTS.Abstractions.dll</HintPath>
+    <Reference Include="Refractored.Xam.TTS.Abstractions, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.5\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Refractored.Xam.TTS.Abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.IO.Compression">
       <HintPath>..\packages\Microsoft.Bcl.Compression.3.9.85\lib\portable-net45+win8+wp8+wpa81\System.IO.Compression.dll</HintPath>

+ 2 - 2
Demos/TwitterSearch/TwitterSearch.Portable/ViewModels/TwitterViewModel.cs

@@ -64,7 +64,7 @@ namespace TwitterSearch.Portable.ViewModels
              CreatedAt = tweet.CreatedAt,
              Url = string.Format("https://m.twitter.com/{0}/status/{1}", tweet.User.ScreenNameResponse, tweet.StatusID),
              Image = (tweet.RetweetedStatus != null && tweet.RetweetedStatus.User != null ?
-                            tweet.RetweetedStatus.User.ProfileImageUrl : tweet.User.ProfileImageUrl)
+                            tweet.RetweetedStatus.User.ProfileImageUrl.Replace("http://", "https://") : tweet.User.ProfileImageUrl.Replace("http://", "https://"))
            }).ToList();
 
         foreach (var tweet in tweets)
@@ -72,7 +72,7 @@ namespace TwitterSearch.Portable.ViewModels
           Tweets.Add(tweet);
         }
       }
-      catch (Exception ex)
+      catch
       {
       }
 

+ 1 - 1
Demos/TwitterSearch/TwitterSearch.Portable/packages.config

@@ -10,5 +10,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
   <package id="Rx-Main" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
-  <package id="Xam.Plugins.TextToSpeech" version="1.0.1" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
+  <package id="Xam.Plugins.TextToSpeech" version="1.0.5" targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10" />
 </packages>

+ 6 - 6
Demos/TwitterSearch/TwitterSearch.WindowsPhone/TwitterSearch.WindowsPhone.csproj

@@ -153,13 +153,13 @@
     <Reference Include="LinqToTwitterPcl">
       <HintPath>..\packages\LinqToTwitter.3.1.2\lib\wp8\LinqToTwitterPcl.dll</HintPath>
     </Reference>
-    <Reference Include="Refractored.Xam.TTS, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.1\lib\wp8\Refractored.Xam.TTS.dll</HintPath>
+    <Reference Include="Refractored.Xam.TTS, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.5\lib\wp8\Refractored.Xam.TTS.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Refractored.Xam.TTS.Abstractions, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.1\lib\wp8\Refractored.Xam.TTS.Abstractions.dll</HintPath>
+    <Reference Include="Refractored.Xam.TTS.Abstractions, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Xam.Plugins.TextToSpeech.1.0.5\lib\wp8\Refractored.Xam.TTS.Abstractions.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.IO.Compression">
       <HintPath>..\packages\Microsoft.Bcl.Compression.3.9.85\lib\wp8\System.IO.Compression.dll</HintPath>

+ 1 - 1
Demos/TwitterSearch/TwitterSearch.WindowsPhone/packages.config

@@ -10,5 +10,5 @@
   <package id="Rx-Linq" version="2.2.5" targetFramework="wp80" />
   <package id="Rx-Main" version="2.2.5" targetFramework="wp80" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="wp80" />
-  <package id="Xam.Plugins.TextToSpeech" version="1.0.1" targetFramework="wp80" />
+  <package id="Xam.Plugins.TextToSpeech" version="1.0.5" targetFramework="wp80" />
 </packages>

+ 7 - 7
Demos/TwitterSearch/TwitterSearch.iOS/TwitterSearch.iOS.csproj

@@ -109,7 +109,7 @@
       <HintPath>..\packages\LinqToTwitter.3.1.2\lib\portable-win8+net45+wp8\LinqToTwitterPcl.dll</HintPath>
     </Reference>
     <Reference Include="SDWebImage">
-      <HintPath>..\Components\sdwebimage-3.7.1.3\lib\ios-unified\SDWebImage.dll</HintPath>
+      <HintPath>..\Components\sdwebimage-3.7.3.1\lib\ios-unified\SDWebImage.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Net.Http.Extensions">
@@ -151,12 +151,6 @@
     <BundleResource Include="Resources\Icon-Small-40%402x.png" />
     <BundleResource Include="Resources\Icon-Small-40%403x.png" />
   </ItemGroup>
-  <ItemGroup>
-    <XamarinComponentReference Include="sdwebimage">
-      <Visible>False</Visible>
-      <Version>3.7.1.4</Version>
-    </XamarinComponentReference>
-  </ItemGroup>
   <ItemGroup>
     <BundleResource Include="Resources\Default-568h%402x.png" />
   </ItemGroup>
@@ -166,6 +160,12 @@
       <Name>TwitterSearch.Portable</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <XamarinComponentReference Include="sdwebimage">
+      <Visible>False</Visible>
+      <Version>3.7.3.1</Version>
+    </XamarinComponentReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

BIN
Demos/TwitterSearch/UpgradeLog.htm


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels