Skip to content

Commit c64ed57

Browse files
author
Charles Petzold
committed
[XamlSamples] Upgraded to 1.3.1
And hopefully fixed Configuration Manager problem.
1 parent 668fda2 commit c64ed57

File tree

12 files changed

+209
-269
lines changed

12 files changed

+209
-269
lines changed

‎XAMLSamples/XamlSamples.sln

+136-125
Large diffs are not rendered by default.

‎XAMLSamples/XamlSamples2/XamlSamples2.sln

-92
This file was deleted.

‎XAMLSamples/xamlsamples/xamlsamples.android/XamlSamples.Android.csproj

+25-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -21,7 +21,7 @@
2121
<JavaMaximumHeapSize>
2222
</JavaMaximumHeapSize>
2323
<JavaOptions />
24-
<NuGetPackageImportStamp>bb7b8b1f</NuGetPackageImportStamp>
24+
<NuGetPackageImportStamp>bd24bba6</NuGetPackageImportStamp>
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2727
<DebugSymbols>true</DebugSymbols>
@@ -43,29 +43,31 @@
4343
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
4444
</PropertyGroup>
4545
<ItemGroup>
46+
<Reference Include="FormsViewGroup, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
47+
<SpecificVersion>False</SpecificVersion>
48+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
49+
</Reference>
4650
<Reference Include="Mono.Android" />
4751
<Reference Include="mscorlib" />
4852
<Reference Include="System" />
4953
<Reference Include="System.Core" />
5054
<Reference Include="System.Xml.Linq" />
5155
<Reference Include="System.Xml" />
52-
<Reference Include="Xamarin.Android.Support.v13">
53-
<HintPath>..\..\packages\Xamarin.Android.Support.v13.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v13.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Xamarin.Android.Support.v4">
56-
<HintPath>..\..\packages\Xamarin.Android.Support.v4.20.0.0.4\lib\MonoAndroid32\Xamarin.Android.Support.v4.dll</HintPath>
56+
<Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<SpecificVersion>False</SpecificVersion>
58+
<HintPath>..\..\packages\Xamarin.Android.Support.v4.21.0.3.0\lib\MonoAndroid10\Xamarin.Android.Support.v4.dll</HintPath>
5759
</Reference>
58-
<Reference Include="Xamarin.Forms.Platform.Android">
59-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
60+
<Reference Include="Xamarin.Forms.Core, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
6063
</Reference>
61-
<Reference Include="FormsViewGroup">
62-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
64+
<Reference Include="Xamarin.Forms.Platform.Android, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
65+
<SpecificVersion>False</SpecificVersion>
66+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
6367
</Reference>
64-
<Reference Include="Xamarin.Forms.Core">
65-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
66-
</Reference>
67-
<Reference Include="Xamarin.Forms.Xaml">
68-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
68+
<Reference Include="Xamarin.Forms.Xaml, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
69+
<SpecificVersion>False</SpecificVersion>
70+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
6971
</Reference>
7072
</ItemGroup>
7173
<ItemGroup>
@@ -96,7 +98,13 @@
9698
</ProjectReference>
9799
</ItemGroup>
98100
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
99-
<Import Project="..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
101+
<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')" />
102+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
103+
<PropertyGroup>
104+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
105+
</PropertyGroup>
106+
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
107+
</Target>
100108
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
101109
Other similar extension points exist, see Microsoft.Common.targets.
102110
<Target Name="BeforeBuild">

‎XAMLSamples/xamlsamples/xamlsamples.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.0.6275-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>

‎XAMLSamples/xamlsamples/xamlsamples.android/resources/Resource.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎XAMLSamples/xamlsamples/xamlsamples.ios/XamlSamples.iOS.csproj

+18-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<RootNamespace>XamlSamples.iOS</RootNamespace>
1010
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1111
<AssemblyName>FormsTemplateiOS</AssemblyName>
12-
<NuGetPackageImportStamp>4c4c94d4</NuGetPackageImportStamp>
12+
<NuGetPackageImportStamp>3d4ae5bf</NuGetPackageImportStamp>
1313
<TargetFrameworkIdentifier>Xamarin.iOS</TargetFrameworkIdentifier>
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
@@ -91,16 +91,19 @@
9191
<Reference Include="System" />
9292
<Reference Include="System.Xml" />
9393
<Reference Include="System.Core" />
94-
<Reference Include="Xamarin.iOS" />
95-
<Reference Include="Xamarin.Forms.Platform.iOS">
96-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
94+
<Reference Include="Xamarin.Forms.Core, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
95+
<SpecificVersion>False</SpecificVersion>
96+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
9797
</Reference>
98-
<Reference Include="Xamarin.Forms.Core">
99-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
98+
<Reference Include="Xamarin.Forms.Platform.iOS, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
99+
<SpecificVersion>False</SpecificVersion>
100+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
100101
</Reference>
101-
<Reference Include="Xamarin.Forms.Xaml">
102-
<HintPath>..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
102+
<Reference Include="Xamarin.Forms.Xaml, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
103+
<SpecificVersion>False</SpecificVersion>
104+
<HintPath>..\..\packages\Xamarin.Forms.1.3.1.6296\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
103105
</Reference>
106+
<Reference Include="Xamarin.iOS" />
104107
</ItemGroup>
105108
<ItemGroup>
106109
<BundleResource Include="Resources\Default.png" />
@@ -151,5 +154,11 @@
151154
<BundleResource Include="Resources\Icon-Small-50%402x.png" />
152155
</ItemGroup>
153156
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
154-
<Import Project="..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.1.3.0.6275-pre1\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
157+
<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')" />
158+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
159+
<PropertyGroup>
160+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
161+
</PropertyGroup>
162+
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.1.3.1.6296\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets'))" />
163+
</Target>
155164
</Project>

‎XAMLSamples/xamlsamples/xamlsamples.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.0.6275-pre1" targetFramework="xamarinios10" />
3+
<package id="Xamarin.Forms" version="1.3.1.6296" targetFramework="xamarinios10" />
44
</packages>

0 commit comments

Comments
 (0)