Improve a couple of build and project files (#2752)

* Improve a couple of build and project files

* Move clone depth

* Try to set it inside

* Make clone size bigger

* Remove clone depth
This commit is contained in:
Martijn van Dijk 2018-04-02 14:02:51 +02:00 коммит произвёл GitHub
Родитель e37c07f790
Коммит 573d0ac68f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
10 изменённых файлов: 21 добавлений и 32 удалений

Просмотреть файл

@ -24,14 +24,19 @@
<DebugType>full</DebugType>
<IsTestProject>$(MSBuildProjectName.Contains('UnitTest'))</IsTestProject>
<IsLibraryProject>$(MSBuildProjectName.Contains('MvvmCross'))</IsLibraryProject>
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
</PropertyGroup>
<ItemGroup Condition="'$(IsLibraryProject)' == 'true'">
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.2" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsLibraryProject)' == 'true'">
<PackageReference Include="SourceLink.Create.CommandLine" Version="2.8.0" PrivateAssets="All" />
</ItemGroup>
<ItemGroup Condition="'$(IsXamarinForms)' == 'true'">
<PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
</ItemGroup>
</Project>

Просмотреть файл

@ -568,7 +568,7 @@ namespace MvvmCross.Droid.Support.V7.AppCompat
protected virtual Fragment FindFragmentInChildren(string fragmentName, FragmentManager fragManager)
{
if (fragManager?.Fragments != null && !fragManager.Fragments.Any()) return null;
if (!(fragManager?.Fragments?.Any() ?? false)) return null;
foreach (var fragment in fragManager.Fragments)
{

Просмотреть файл

@ -79,13 +79,7 @@
<Compile Include="Platforms\Xamarin-common\**\*.cs" />
<PackageReference Include="Tizen.NET" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.0.280555</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MvvmCross\MvvmCross.csproj" />
</ItemGroup>

Просмотреть файл

@ -5,11 +5,17 @@
<Owners>MvvmCross;slodge;cheesebaron;martijn00</Owners>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<NeutralLanguage>en</NeutralLanguage>
<Version>6.0.0</Version>
<LangVersion>latest</LangVersion>
<NoWarn>$(NoWarn);1591;1701;1702;1705</NoWarn>
<NoWarn>$(NoWarn);1591;1701;1702;1705;VSX1000</NoWarn>
<Platform>AnyCPU</Platform>
<DebugType>full</DebugType>
<IsXamarinForms>$(MSBuildProjectName.Contains('.Forms'))</IsXamarinForms>
</PropertyGroup>
<ItemGroup Condition="'$(IsXamarinForms)' == 'true'">
<PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
</ItemGroup>
</Project>

Просмотреть файл

@ -157,9 +157,6 @@
<PackageReference Include="Xamarin.Build.Download">
<Version>0.4.9</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.0.280555</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\MvvmCross.Android.Support\Design\MvvmCross.Droid.Support.Design.csproj">

Просмотреть файл

@ -3,11 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="2.5.0.280555" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\MvvmCross.Forms\MvvmCross.Forms.csproj" />
<ProjectReference Include="..\..\..\MvvmCross.Plugins\JsonLocalization\MvvmCross.Plugin.JsonLocalization.csproj" />

Просмотреть файл

@ -142,9 +142,6 @@
<PackageReference Include="NETStandard.Library">
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.0.280555</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />

Просмотреть файл

@ -119,11 +119,6 @@
<Name>Playground.Forms.UI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.0.280555</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>

Просмотреть файл

@ -156,10 +156,5 @@
<BundleResource Include="Resources\MvvmCross%402x.png" />
<BundleResource Include="Resources\MvvmCross%403x.png" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.0.280555</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>

Просмотреть файл

@ -5,6 +5,8 @@
- /release\/.*/
version: 1.0.{build}
image: Previous Visual Studio 2017
before_build:
- cmd: dotnet --info
environment:
NUGET_SOURCE: https://www.nuget.org/api/v2/package
NUGET_APIKEY:
@ -20,6 +22,8 @@
- develop
version: 1.0.{build}
image: Previous Visual Studio 2017
before_build:
- cmd: dotnet --info
environment:
NUGET_SOURCE: https://www.myget.org/F/mvvmcross/api/v2/package
NUGET_APIKEY: