Skip to content

Commit 87daf2d

Browse files
conceptdevconceptdev
committed
[working-with] fonts update to 1.3.1
1 parent 13c0d55 commit 87daf2d

File tree

6 files changed

+19
-23
lines changed

6 files changed

+19
-23
lines changed

‎WorkingWithFonts/Android/WorkingWithFonts.Android.csproj

+8-11
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,20 @@
4242
<Reference Include="System.Xml" />
4343
<Reference Include="System.Core" />
4444
<Reference Include="Mono.Android" />
45-
<Reference Include="Xamarin.Android.Support.v13">
46-
<HintPath>..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Xamarin.Android.Support.v4">
49-
<HintPath>..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
50-
</Reference>
5145
<Reference Include="Xamarin.Forms.Platform.Android">
52-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
46+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
5347
</Reference>
5448
<Reference Include="FormsViewGroup">
55-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
49+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
5650
</Reference>
5751
<Reference Include="Xamarin.Forms.Core">
58-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
52+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
5953
</Reference>
6054
<Reference Include="Xamarin.Forms.Xaml">
61-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
55+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Xamarin.Android.Support.v4">
58+
<HintPath>..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
6259
</Reference>
6360
</ItemGroup>
6461
<ItemGroup>
@@ -87,7 +84,7 @@
8784
<AndroidResource Include="Resources\drawable\xaml.png" />
8885
</ItemGroup>
8986
<Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
90-
<Import Project="..\packages\Xamarin.Forms.1.3.1.6294-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6294-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
87+
<Import Project="..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
9188
<ItemGroup>
9289
<AndroidAsset Include="Assets\SF Hollywood Hills.ttf" />
9390
</ItemGroup>

‎WorkingWithFonts/Android/packages.config

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Android.Support.v13" version="20.0.0.4" targetFramework="MonoAndroid44" />
4-
<package id="Xamarin.Android.Support.v4" version="20.0.0.4" targetFramework="MonoAndroid44" />
5-
<package id="Xamarin.Forms" version="1.3.1.6294-pre1" targetFramework="MonoAndroid44" />
3+
<package id="Xamarin.Android.Support.v4" version="21.0.3.0" targetFramework="MonoAndroid44" />
4+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="MonoAndroid44" />
65
</packages>

‎WorkingWithFonts/WorkingWithFonts/WorkingWithFonts.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@
3939
<Compile Include="FontPageCs.cs" />
4040
</ItemGroup>
4141
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
42-
<Import Project="..\packages\Xamarin.Forms.1.3.1.6294-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6294-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
42+
<Import Project="..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
4343
<ItemGroup>
4444
<EmbeddedResource Include="FontPageXaml.xaml">
4545
<Generator>MSBuild:Compile</Generator>
4646
</EmbeddedResource>
4747
</ItemGroup>
4848
<ItemGroup>
4949
<Reference Include="Xamarin.Forms.Core">
50-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
50+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Xamarin.Forms.Xaml">
53-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
53+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
5454
</Reference>
5555
</ItemGroup>
5656
<ItemGroup>

‎WorkingWithFonts/WorkingWithFonts/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="1.3.1.6294-pre1" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
3+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="portable-net45+win+wp80+MonoTouch10+MonoAndroid10+xamarinmac20+xamarinios10" />
44
</packages>

‎WorkingWithFonts/iOS/WorkingWithFonts.iOS.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
<Reference Include="System.Core" />
9191
<Reference Include="Xamarin.iOS" />
9292
<Reference Include="Xamarin.Forms.Platform.iOS">
93-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
93+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
9494
</Reference>
9595
<Reference Include="Xamarin.Forms.Core">
96-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
96+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
9797
</Reference>
9898
<Reference Include="Xamarin.Forms.Xaml">
99-
<HintPath>..\packages\Xamarin.Forms.1.3.1.6294-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
99+
<HintPath>..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
100100
</Reference>
101101
</ItemGroup>
102102
<ItemGroup>
@@ -131,7 +131,7 @@
131131
</ItemGroup>
132132
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
133133
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
134-
<Import Project="..\packages\Xamarin.Forms.1.3.1.6294-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6294-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
134+
<Import Project="..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
135135
<ItemGroup>
136136
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
137137
</ItemGroup>

‎WorkingWithFonts/iOS/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Xamarin.Forms" version="1.3.1.6294-pre1" targetFramework="xamarinios10" />
3+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="xamarinios10" />
44
</packages>

0 commit comments

Comments
 (0)