Merge pull request #115 from unoplatform/dev/jela/update3
Use VS2019 hosted agents, update uno
This commit is contained in:
Jérôme Laban
GitHub
Коммит
13a3369135
|
|
@ -6,7 +6,7 @@ jobs:
|
|||
AndroidNdkDirectory: C:\Microsoft\AndroidNDK64\android-ndk-r15c
|
||||
|
||||
pool:
|
||||
name: "Hosted VS2017"
|
||||
vmImage: 'windows-2019'
|
||||
|
||||
workspace:
|
||||
clean: all
|
||||
|
|
@ -119,8 +119,9 @@ jobs:
|
|||
|
||||
# UWP BUILD
|
||||
- job: UWP
|
||||
|
||||
pool:
|
||||
name: "Hosted VS2017"
|
||||
vmImage: 'windows-2019'
|
||||
|
||||
workspace:
|
||||
clean: all
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nventive.uno.ui.demo" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
|
||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="26" />
|
||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
|
||||
<application android:label="Uno Gallery" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:theme="@style/AppTheme"></application>
|
||||
</manifest>
|
||||
</manifest>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
|
||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
|
||||
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
|
||||
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
|
||||
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
|
||||
<DefaultLanguage>en</DefaultLanguage>
|
||||
|
|
@ -81,13 +81,13 @@
|
|||
<Version>11.0.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.CodeGen">
|
||||
<Version>1.33.0-dev.143</Version>
|
||||
<Version>1.33.0-dev.169</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.Core">
|
||||
<Version>1.29.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.UI">
|
||||
<Version>2.1.0-dev.54</Version>
|
||||
<Version>2.2.0-dev.256</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
|
||||
|
|
@ -95,15 +95,19 @@
|
|||
<Version>1.9.32</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Android.Support.v4">
|
||||
<Version>26.1.0.1</Version>
|
||||
<Version>28.0.0.1</Version>
|
||||
<PrivateAssets>none</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
|
||||
<Version>26.1.0.1</Version>
|
||||
<Version>28.0.0.1</Version>
|
||||
<PrivateAssets>none</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView">
|
||||
<Version>26.1.0.1</Version>
|
||||
<Version>28.0.0.1</Version>
|
||||
<PrivateAssets>none</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Xamarin.Android.Support.ViewPager">
|
||||
<Version>28.0.0.1</Version>
|
||||
<PrivateAssets>none</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Nito.Collections.Deque">
|
||||
|
|
@ -173,4 +177,4 @@
|
|||
-->
|
||||
<Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
|
||||
<Import Project="..\Package.targets" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
<Version>11.0.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.CodeGen">
|
||||
<Version>1.33.0-dev.143</Version>
|
||||
<Version>1.33.0-dev.169</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.Core">
|
||||
<Version>1.29.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.UI">
|
||||
<Version>2.1.0-dev.54</Version>
|
||||
<Version>2.2.0-dev.256</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
|
|
@ -60,9 +60,9 @@
|
|||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Uno.UI" Version="2.1.0-dev.54" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.0.10" />
|
||||
<PackageReference Include="Uno.CodeGen" Version="1.33.0-dev.143" />
|
||||
<PackageReference Include="Uno.UI" Version="2.2.0-dev.256" />
|
||||
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.1.0-dev.438" />
|
||||
<PackageReference Include="Uno.CodeGen" Version="1.33.0-dev.169" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
|
||||
<DotNetCliToolReference Include="Uno.Wasm.Bootstrap.Cli" Version="1.0.0" />
|
||||
|
|
|
|||
|
|
@ -182,13 +182,13 @@
|
|||
<Version>11.0.2</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.CodeGen">
|
||||
<Version>1.33.0-dev.143</Version>
|
||||
<Version>1.33.0-dev.169</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.Core">
|
||||
<Version>1.29.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.UI">
|
||||
<Version>2.1.0-dev.54</Version>
|
||||
<Version>2.2.0-dev.256</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "Build\Build.csproj
|
|||
EndProject
|
||||
Global
|
||||
GlobalSection(SharedMSBuildProjectFiles) = preSolution
|
||||
Uno.Playground.Shared\Uno.Playground.Shared.projitems*{25da869c-40cb-4c9a-a1e8-a685b7d4ea90}*SharedItemsImports = 5
|
||||
Uno.Playground.Shared\Uno.Playground.Shared.projitems*{5077c264-ad1a-4ffa-899c-a564f624f161}*SharedItemsImports = 4
|
||||
Uno.Playground.Shared\Uno.Playground.Shared.projitems*{6279c845-92f8-4333-ab99-3d213163593c}*SharedItemsImports = 13
|
||||
Uno.Playground.Shared\Uno.Playground.Shared.projitems*{85473adf-7c3b-415b-b68d-0b90483ceb26}*SharedItemsImports = 4
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче