Skip to content

Remove the Use2017 build property #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sharwell wants to merge 3 commits into from
Closed

Remove the Use2017 build property #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c1af67
Remove the Use2017 build property
sharwell May 18, 2020
eee07ad
Remove VS 2017 build steps
sharwell May 18, 2020
2495691
Rename Nuget2019.Build.targets to Nuget.Build.targets
sharwell May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .nuspec/Xamarin.Forms.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,18 +233,12 @@
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*pdb" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*mdb" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.dll" target="build\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*pdb" target="build\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*mdb" target="build\XCODE10" />


<!--iPhone Unified buildTransitive-->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.dll" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*pdb" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\Xamarin.Forms.Platform.iOS.*mdb" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.dll" target="buildTransitive\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*pdb" target="buildTransitive\XCODE10" />
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.iOS.*mdb" target="buildTransitive\XCODE10" />

<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.iOS10" />
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.*pdb" target="lib\Xamarin.iOS10" />
Expand Down Expand Up @@ -288,23 +282,14 @@
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.*pdb" target="lib\uap10.0.16299" />
<file src="..\docs\Xamarin.Forms.Xaml.xml" target="lib\uap10.0.16299" />


<!-- VS 2017 needs these-->
<file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.14393\**\*.xaml" target="lib\uap10.0.14393\Xamarin.Forms.Platform.UAP" />
<!-- VS 2017 needs these 16299-->
<file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.16299\**\*.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP" />
<file src="..\Xamarin.Forms.Platform.UAP\obj\$Configuration$\uap10.0.14393\Microsoft.UI.Xaml\**\*.xaml" target="lib\uap10.0.16299\Xamarin.Forms.Platform.UAP\Microsoft.UI.Xaml" />

<!--Mac-->
<file src="..\Xamarin.Forms.Core\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Core.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Xaml\bin\$Configuration$\netstandard2.0\Xamarin.Forms.Xaml.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.dll" target="lib\Xamarin.Mac" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="build\XCODE11" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.macOS.dll" target="build\XCODE10" />

<!--Mac buildTransitive-->
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\Xamarin.Forms.Platform.macOS.dll" target="buildTransitive\XCODE11" />
<file src="..\Xamarin.Forms.Platform.MacOS\bin\$Configuration$\2017\Xamarin.Forms.Platform.macOS.dll" target="buildTransitive\XCODE10" />

<!-- iOS Localized String Resource Assemblies -->
<file src="..\Xamarin.Forms.Platform.iOS\bin\$Configuration$\ar\Xamarin.Forms.Platform.iOS.resources.dll" target="lib\Xamarin.iOS10\ar" />
Expand Down
10 changes: 1 addition & 9 deletions .nuspec/Xamarin.Forms.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,22 +200,14 @@

<Target Name="IncludeCorrectXIOSReference" Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' OR '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PropertyGroup>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
<Use2017 Condition="'$(Use2017)' == ''">false</Use2017>
<FrameworkDll Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">Xamarin.Forms.Platform.iOS.dll</FrameworkDll>
<FrameworkDll Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">Xamarin.Forms.Platform.macOS.dll</FrameworkDll>
</PropertyGroup>
<ItemGroup Condition="'$(Use2017)' != 'true'">
<ItemGroup>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>$(MSBuildThisFileDirectory)\XCODE11\$(FrameworkDll)</HintPath>
</Reference>
</ItemGroup>
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>$(MSBuildThisFileDirectory)\XCODE10\$(FrameworkDll)</HintPath>
</Reference>
</ItemGroup>
</Target>

<!-- UWP Targets-->
Expand Down
3 changes: 0 additions & 3 deletions DualScreen/DualScreen.UWP/DualScreen.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,5 @@
<Name>DualScreen</Name>
</ProjectReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
</Project>
1 change: 0 additions & 1 deletion EmbeddingTestBeds/Embedding.Droid/Embedding.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == '' AND '$(Use2017)' == 'true'">v9.0</AndroidTargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v10.0</AndroidTargetFrameworkVersion>
<TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) != 'v9.0'">Properties\AndroidManifest.xml</AndroidManifest>
Expand Down
4 changes: 2 additions & 2 deletions EmbeddingTestBeds/Embedding.iOS/Embedding.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RootNamespace>Embedding.iOS</RootNamespace>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<AssemblyName>Embedding.iOS</AssemblyName>
<DefineConstants Condition="'$(Use2017)' != 'true'">__XCODE11__;$(DefineConstants);</DefineConstants>
<DefineConstants>__XCODE11__;$(DefineConstants);</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -88,7 +88,7 @@
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Condition="'$(Use2017)' != 'true'" Include="..\..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<ProjectReference Include="..\..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<Project>{8a75b1dc-ceed-4b1b-8675-a7dffd1e6de4}</Project>
<Name>Xamarin.Forms.Material.iOS</Name>
<IsAppExtension>false</IsAppExtension>
Expand Down
9 changes: 1 addition & 8 deletions Environment.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,9 @@
<FromSource Condition="'$(FromSource)' == ''">true</FromSource>
</PropertyGroup>

<PropertyGroup>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildRuntimeType)' == 'Mono'">$(FrameworkSDKRoot.Contains('/Versions/5'))</Use2017>
<Use2017 Condition="'$(Use2017)' == '' AND '$(MSBuildAssemblyVersion)' &lt; '16.0'">true</Use2017>
<Use2017 Condition="'$(Use2017)' == ''">false</Use2017>
</PropertyGroup>

<!-- This is used by the libraries -->
<PropertyGroup Condition="'$(AndroidTargetFrameworks)' == ''">
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'true'">MonoAndroid90;</AndroidTargetFrameworks>
<AndroidTargetFrameworks Condition="'$(Use2017)' == 'false'">MonoAndroid90;MonoAndroid10.0;</AndroidTargetFrameworks>
<AndroidTargetFrameworks>MonoAndroid90;MonoAndroid10.0;</AndroidTargetFrameworks>
</PropertyGroup>

<!-- Auto install any missing Android SDKs -->
Expand Down
1 change: 0 additions & 1 deletion PagesGallery/PagesGallery.Droid/PagesGallery.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == '' AND '$(Use2017)' == 'true'">v9.0</AndroidTargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v10.0</AndroidTargetFrameworkVersion>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) != 'v9.0'">Properties\AndroidManifest.xml</AndroidManifest>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) == 'v9.0'">Properties\AndroidManifest28.xml</AndroidManifest>
Expand Down
4 changes: 2 additions & 2 deletions PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<XFDisableTargetsValidation>True</XFDisableTargetsValidation>
<DefineConstants Condition="'$(Use2017)' != 'true'">__XCODE11__;$(DefineConstants);</DefineConstants>
<DefineConstants>__XCODE11__;$(DefineConstants);</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -79,7 +79,7 @@
<Project>{57b8b73d-c3b5-4c42-869e-7b2f17d354ac}</Project>
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
<ProjectReference Condition="'$(Use2017)' != 'true'" Include="..\..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<ProjectReference Include="..\..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<Project>{8a75b1dc-ceed-4b1b-8675-a7dffd1e6de4}</Project>
<Name>Xamarin.Forms.Material.iOS</Name>
<IsAppExtension>false</IsAppExtension>
Expand Down
4 changes: 0 additions & 4 deletions Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\Xamarin.Forms.Platform.cs" Link="Xamarin.Forms.Platform.cs" />
</ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions Stubs/Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS (Forwarders).csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions Xamarin.Forms.ControlGallery.Android/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<Import Project="Android10.Build.targets" Condition="'$(TargetFrameworkVersion)' == 'v10.0'" />
<Import Condition="'$(Use2017)' == 'true'" Project="Nuget2017.Build.targets" />
<Import Condition="'$(Use2017)' != 'true'" Project="Nuget2019.Build.targets" />
<Import Project="Nuget.Build.targets" />
<Import Project="..\Nuget.targets" Condition="'$(FromSource)' == 'false'" />
</Project>
0 ...olGallery.Android/Nuget2019.Build.targets → ...ontrolGallery.Android/Nuget.Build.targets
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions Xamarin.Forms.ControlGallery.Android/Nuget2017.Build.targets
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<AndroidApplication>true</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == '' AND '$(Use2017)' == 'true'">v9.0</AndroidTargetFrameworkVersion>
<AndroidTargetFrameworkVersion Condition="'$(AndroidTargetFrameworkVersion)' == ''">v10.0</AndroidTargetFrameworkVersion>
<TargetFrameworkVersion>$(AndroidTargetFrameworkVersion)</TargetFrameworkVersion>
<AndroidManifest Condition="$(AndroidTargetFrameworkVersion) != 'v9.0'">Properties\AndroidManifest.xml</AndroidManifest>
Expand Down Expand Up @@ -67,10 +66,9 @@
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AndroidDexTool Condition="'$(Use2017)' != 'true'">d8</AndroidDexTool>
<AndroidLinkTool Condition="'$(Use2017)' != 'true'">r8</AndroidLinkTool>
<AndroidEnableMultiDex Condition="'$(Use2017)' != 'true'">false</AndroidEnableMultiDex>
<AndroidEnableMultiDex Condition="'$(Use2017)' == 'true'">true</AndroidEnableMultiDex>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidLinkTool>r8</AndroidLinkTool>
<AndroidEnableMultiDex>false</AndroidEnableMultiDex>
</PropertyGroup>
<PropertyGroup Condition="'$(CI)' == 'true'">
<AndroidLinkMode>Full</AndroidLinkMode>
Expand Down
4 changes: 2 additions & 2 deletions Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<AssemblyName>XamarinFormsControlGalleryiOS</AssemblyName>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<DefineConstants Condition="'$(Use2017)' != 'true'">__XCODE11__;$(DefineConstants);</DefineConstants>
<DefineConstants>__XCODE11__;$(DefineConstants);</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -187,7 +187,7 @@
<IsAppExtension>false</IsAppExtension>
<IsWatchApp>false</IsWatchApp>
</ProjectReference>
<ProjectReference Condition="'$(Use2017)' != 'true'" Include="..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<ProjectReference Include="..\Xamarin.Forms.Material.iOS\Xamarin.Forms.Material.iOS.csproj">
<Project>{8A75B1DC-CEED-4B1B-8675-A7DFFD1E6DE4}</Project>
<Name>Xamarin.Forms.Material.iOS</Name>
<IsAppExtension>false</IsAppExtension>
Expand Down
4 changes: 0 additions & 4 deletions Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="**\*.shared.cs" />
<Compile Include="**\*.shared.*.cs" />
Expand Down
4 changes: 0 additions & 4 deletions Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
</ProjectReference>
Expand Down
3 changes: 0 additions & 3 deletions Xamarin.Forms.Maps.iOS/Xamarin.Forms.Maps.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,6 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions Xamarin.Forms.Material.Android/Xamarin.Forms.Material.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<AndroidResource Include="Resources\**\*" />
</ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions Xamarin.Forms.Material.iOS/Xamarin.Forms.Material.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,6 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions Xamarin.Forms.Platform.Android.AppLinks/Xamarin.Forms.Platform.Android.AppLinks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<None Remove="Resources\values\Strings.xml" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
<PropertyGroup Condition=" '$(Configuration)'=='Debug' ">
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<PropertyGroup Condition="'$(Use2017)' == 'true'">
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>bin\$(Configuration)\$(TargetFramework)</OutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Remove="AppCompat\Resource.cs" />
</ItemGroup>
Expand Down
6 changes: 1 addition & 5 deletions Xamarin.Forms.Platform.MacOS/Xamarin.Forms.Platform.macOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,7 @@
<XamMacArch>
</XamMacArch>
</PropertyGroup>
<PropertyGroup Condition=" '$(Use2017)' == 'true' ">
<DefineConstants>__XCODE10__;$(DefineConstants);</DefineConstants>
<OutputPath>$(OutputPath)\2017</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Use2017)' != 'true' ">
<PropertyGroup>
<DefineConstants>__XCODE11__;$(DefineConstants);</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion Xamarin.Forms.Platform.UAP/Xamarin.Forms.Platform.UAP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<SkipMicrosoftUIXamlCheckTargetPlatformVersion>true</SkipMicrosoftUIXamlCheckTargetPlatformVersion>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<GenerateLibraryLayout Condition="'$(Use2017)' == 'true'">true</GenerateLibraryLayout>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down
9 changes: 1 addition & 8 deletions Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Use2017)' == 'true' ">
<DefineConstants>$(DefineConstants);__XCODE10__</DefineConstants>
<OutputPath>$(OutputPath)\2017</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Use2017)' != 'true' ">
<PropertyGroup>
<DefineConstants>$(DefineConstants);__XCODE11__</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -86,8 +82,5 @@
<Version>3.12.0</Version>
</PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
9 changes: 1 addition & 8 deletions Xamarin.Forms.Platform.iOS/Xamarin.Forms.Platform.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,7 @@
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Use2017)' == 'true' ">
<DefineConstants>$(DefineConstants);__XCODE10__</DefineConstants>
<OutputPath>$(OutputPath)\2017</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Use2017)' != 'true' ">
<PropertyGroup>
<DefineConstants>$(DefineConstants);__XCODE11__</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down Expand Up @@ -314,9 +310,6 @@
<Name>Xamarin.Forms.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(Use2017)' == 'true'">
<Reference Include="netstandard" />
</ItemGroup>
<ItemGroup>
<PackageReference Condition="'$(CI)' == 'true'" Include="Xamarin.Build.TypeRedirector" Version="0.1.2-preview" PrivateAssets="all" />
</ItemGroup>
Expand Down
Loading