Skip to content

Commit

Permalink
Fix outdated things
Browse files Browse the repository at this point in the history
  • Loading branch information
martijn00 committed Mar 6, 2020
1 parent e13e3ad commit 89f5d80
Show file tree
Hide file tree
Showing 20 changed files with 139 additions and 203 deletions.
19 changes: 19 additions & 0 deletions Samples/Directory.build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project>
<PropertyGroup>
<Copyright>Copyright (c) Martijn van Dijk</Copyright>
<Owners>Martijn van Dijk</Owners>
<Authors>Martijn van Dijk</Authors>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<Version>1.0.0</Version>

<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000;NU1603</NoWarn>

<Platform>AnyCPU</Platform>
<DebugType>full</DebugType>

<IsLibraryProject>$(MSBuildProjectName.Contains('MediaManager'))</IsLibraryProject>
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
</PropertyGroup>
</Project>
42 changes: 42 additions & 0 deletions Samples/Directory.build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<Project>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<DefineConstants>$(DefineConstants);NETSTANDARD;PORTABLE</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
<DefineConstants>$(DefineConstants);NET;WPF;XAML</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('net5'))">
<DefineConstants>$(DefineConstants);NET;NET5</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('uap'))">
<DefineConstants>$(DefineConstants);NETFX_CORE;XAML;WINDOWS;WINDOWS_UWP;UWP</DefineConstants>
<TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.ios'))">
<DefineConstants>$(DefineConstants);MONO;UIKIT;COCOA;APPLE;IOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.mac'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;MAC</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.tvos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;TVOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('xamarin.watchos'))">
<DefineConstants>$(DefineConstants);MONO;COCOA;APPLE;WATCHOS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('monoandroid'))">
<DefineConstants>$(DefineConstants);MONO;ANDROID</DefineConstants>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<AndroidResgenClass>Resource</AndroidResgenClass>
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('netcoreapp'))">
<DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith('tizen'))">
<DefineConstants>$(DefineConstants);TIZEN</DefineConstants>
<TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Samples/NavigationSample/NavigationSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default-568h%402x.png" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@
<BundleResource Include="Resources\threelines.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Xamarin-Sidebar-Unified\Xamarin-Sidebar-Unified.csproj">
<Project>{72600F4A-51F2-4E93-8688-8198DE0F8EF4}</Project>
<Name>Xamarin-Sidebar-Unified</Name>
<ProjectReference Include="..\..\Xamarin-Sidebar\Xamarin-Sidebar.csproj">
<Project>{4046df23-7fa6-4662-938d-fa3ff45db144}</Project>
<Name>Xamarin-Sidebar</Name>
</ProjectReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Samples/SimpleSample/SimpleSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="monotouch" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default-568h%402x.png" />
Expand Down
9 changes: 6 additions & 3 deletions Samples/StoryboardSample/StoryboardSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="Xamarin-Sidebar-Unified">
<HintPath>..\..\..\..\Xamarin-Sidebar-Unified\bin\Release\Xamarin-Sidebar-Unified.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json">
Expand Down Expand Up @@ -117,4 +114,10 @@
<ItemGroup>
<BundleResource Include="Resources\threelines.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Xamarin-Sidebar\Xamarin-Sidebar.csproj">
<Project>{4046df23-7fa6-4662-938d-fa3ff45db144}</Project>
<Name>Xamarin-Sidebar</Name>
</ProjectReference>
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Samples/UnifiedSample/AppDelegate.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
window.MakeKeyAndVisible();

#if DEBUG
Xamarin.Calabash.Start();
//Xamarin.Calabash.Start();
#endif

return true;
Expand Down
18 changes: 4 additions & 14 deletions Samples/UnifiedSample/UnifiedSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="Calabash">
<HintPath>..\..\..\..\packages\Xamarin.TestCloud.Agent.0.13.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ImageAsset Include="Resources\Images.xcassets\AppIcons.appiconset\Contents.json">
Expand All @@ -106,7 +103,6 @@
<ItemGroup>
<None Include="Info.plist" />
<None Include="Entitlements.plist" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs" />
Expand All @@ -118,17 +114,11 @@
<Compile Include="SideMenuController.cs" />
<Compile Include="SubMenuController.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\..\..\Xamarin-Sidebar-Unified\Xamarin-Sidebar-Unified.csproj">
<Project>{72600F4A-51F2-4E93-8688-8198DE0F8EF4}</Project>
<Name>Xamarin-Sidebar-Unified</Name>
<ProjectReference Include="..\..\Xamarin-Sidebar\Xamarin-Sidebar.csproj">
<Project>{4046df23-7fa6-4662-938d-fa3ff45db144}</Project>
<Name>Xamarin-Sidebar</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<XamarinComponentReference Include="calabash">
<Version>13.0</Version>
<Visible>False</Visible>
</XamarinComponentReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
4 changes: 0 additions & 4 deletions Samples/UnifiedSample/packages.config

This file was deleted.

28 changes: 12 additions & 16 deletions Samples/XamarinFormsSample.iOS/XamarinFormsSample.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.1.3.3.6323\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.3.3.6323\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.3.3.6323\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Calabash">
<HintPath>..\packages\Xamarin.TestCloud.Agent.0.13.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Default.png" />
Expand Down Expand Up @@ -118,11 +106,19 @@
<ITunesArtwork Include="ITunesArtwork%402x" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.1.3.3.6323\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.3.6323\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
<ItemGroup>
<ProjectReference Include="..\Xamarin-Sidebar-Unified\Xamarin-Sidebar-Unified.csproj">
<Project>{72600F4A-51F2-4E93-8688-8198DE0F8EF4}</Project>
<Name>Xamarin-Sidebar-Unified</Name>
<PackageReference Include="Xamarin.Forms">
<Version>4.5.0.356</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Xamarin-Sidebar\Xamarin-Sidebar.csproj">
<Project>{4046df23-7fa6-4662-938d-fa3ff45db144}</Project>
<Name>Xamarin-Sidebar</Name>
</ProjectReference>
<ProjectReference Include="..\XamarinFormsSample\XamarinFormsSample.csproj">
<Project>{d4fca7a5-8620-4182-8031-7fdc78cb94d5}</Project>
<Name>XamarinFormsSample</Name>
</ProjectReference>
</ItemGroup>
</Project>
5 changes: 0 additions & 5 deletions Samples/XamarinFormsSample.iOS/packages.config

This file was deleted.

6 changes: 4 additions & 2 deletions Samples/XamarinFormsSample/IntroPage.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<BasePage xmlns="http://xamarin.com/schemas/2014/forms"
<xamarinformssample:BasePage
xmlns:xamarinformssample="clr-namespace:XamarinFormsSample"
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="XamarinFormsSample.IntroPage">
<ContentPage.Padding>
Expand All @@ -25,4 +27,4 @@ You can also drag the menu open from the right side of the screen"
XAlign="Center" />
</StackLayout>
</ContentPage.Content>
</BasePage>
</xamarinformssample:BasePage>
6 changes: 4 additions & 2 deletions Samples/XamarinFormsSample/MainContentPage.xaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<BasePage xmlns="http://xamarin.com/schemas/2014/forms"
<xamarinformssample:BasePage
xmlns:xamarinformssample="clr-namespace:XamarinFormsSample"
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="XamarinFormsSample.MainContentPage">
<ContentPage.Padding>
Expand All @@ -22,4 +24,4 @@
XAlign="Center" />
</StackLayout>
</ContentPage.Content>
</BasePage>
</xamarinformssample:BasePage>
27 changes: 0 additions & 27 deletions Samples/XamarinFormsSample/Properties/AssemblyInfo.cs

This file was deleted.

76 changes: 16 additions & 60 deletions Samples/XamarinFormsSample/XamarinFormsSample.csproj
Original file line number Diff line number Diff line change
@@ -1,71 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{D4FCA7A5-8620-4182-8031-7FDC78CB94D5}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>XamarinFormsSample</RootNamespace>
<AssemblyName>XamarinFormsSample</AssemblyName>
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFramework>netstandard2.0</TargetFramework>
<ProduceAssemblyReference>true</ProduceAssemblyReference>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DebugType>pdbonly</DebugType>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="XamarinFormSample.cs" />
<Compile Include="IntroPage.xaml.cs">
<DependentUpon>IntroPage.xaml</DependentUpon>
</Compile>
<Compile Include="NavPage.cs" />
<Compile Include="RootPage.xaml.cs">
<DependentUpon>RootPage.xaml</DependentUpon>
</Compile>
<Compile Include="BasePage.cs" />
<Compile Include="MainContentPage.xaml.cs">
<DependentUpon>MainContentPage.xaml</DependentUpon>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.1.3.3.6323\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.3.3.6323\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />

<ItemGroup>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.1.3.3.6323\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.1.3.3.6323\lib\portable-win+net45+wp80+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<PackageReference Include="Xamarin.Forms" Version="4.5.0.356" />
</ItemGroup>

<ItemGroup>
<None Include="packages.config" />
<Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
<None Remove="Resources\**\*.json" />
<EmbeddedResource Include="Resources\**\*.json" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="IntroPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Include="RootPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Include="MainContentPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<Folder Include="Properties\" />
</ItemGroup>

</Project>
4 changes: 0 additions & 4 deletions Samples/XamarinFormsSample/packages.config

This file was deleted.

Loading

0 comments on commit 89f5d80

Please sign in to comment.