Merge branch 'master' into net5

sunxiaotianmg · Jan 26, 2021 · b0cbabd · b0cbabd
2 parents d08899b + b444fce
commit b0cbabd
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 35 deletions.
diff --git a/build/steps/prepare-build.yml b/build/steps/prepare-build.yml
@@ -6,10 +6,10 @@ steps:
   displayName: Ensure 3.1 SDK is Installed
   inputs:
     packageType: 'sdk'
-    version: '3.1.404'
+    version: '3.1.405'
 
 - task: UseDotNet@2
-  displayName: Use .NET 5.0
+  displayName: 'Use global.json SDK'
   inputs:
     packageType: 'sdk'
     useGlobalJson: true

diff --git a/build/steps/set-runtime.yml b/build/steps/set-runtime.yml
@@ -1,12 +1,18 @@
 steps:
 # For more information on what versions of Xcode are available see the following:
-# https://github.com/microsoft/azure-pipelines-image-generation/blob/master/images/macos/macos-10.15-Readme.md
+# https://github.com/microsoft/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md
 - script: build/scripts/xcode-update.sh
   displayName: Force Xcode Update
   env:
     XcodeOverride: $(XcodeOverride)
   condition: ne(variables['XcodeOverride'], '')
 
+- task: UseDotNet@2
+  displayName: 'Use global.json SDK'
+  inputs:
+    packageType: 'sdk'
+    useGlobalJson: true
+
 - script: |
     dotnet tool install --global boots
     boots --stable Mono

diff --git a/e2e/Forms/src/HelloWorld.Android/HelloWorld.Android.csproj b/e2e/Forms/src/HelloWorld.Android/HelloWorld.Android.csproj
@@ -16,7 +16,7 @@
     <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
     <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
     <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>

diff --git a/e2e/Forms/src/HelloWorld.Android/Properties/AndroidManifest.xml b/e2e/Forms/src/HelloWorld.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.prismlibrary.helloworld">
-	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29" />
 	<application android:label="Prism Sandbox" android:icon="@mipmap/icon" android:theme="@style/MainTheme"></application>
 </manifest>
diff --git a/e2e/Forms/src/HelloWorld.Android/Resources/layout/Tabbar.xml b/e2e/Forms/src/HelloWorld.Android/Resources/layout/Tabbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/sliding_tabs"
     android:layout_width="match_parent"

diff --git a/e2e/Forms/src/HelloWorld.Android/Resources/layout/Toolbar.xml b/e2e/Forms/src/HelloWorld.Android/Resources/layout/Toolbar.xml
@@ -1,9 +1,8 @@
-<android.support.v7.widget.Toolbar
+<androidx.appcompat.widget.Toolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/colorPrimary"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
     android:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
diff --git a/e2e/Forms/src/HelloWorld.Android/SplashActivity.cs b/e2e/Forms/src/HelloWorld.Android/SplashActivity.cs
@@ -1,6 +1,6 @@
 using Android.App;
 using Android.Content;
-using Android.Support.V7.App;
+using AndroidX.AppCompat.App;
 
 namespace HelloWorld.Droid
 {
@@ -16,4 +16,4 @@ protected override void OnResume()
             StartActivity(new Intent(Application.Context, typeof(MainActivity)));
         }
     }
-}
+}
diff --git a/e2e/Uno/HelloUnoWorld.Droid/HelloUnoWorld.Droid.csproj b/e2e/Uno/HelloUnoWorld.Droid/HelloUnoWorld.Droid.csproj
@@ -18,7 +18,7 @@
     <AndroidUseAapt2>false</AndroidUseAapt2>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
     <ResourcesDirectory>..\HelloUnoWorld.Shared\Strings</ResourcesDirectory>

diff --git a/e2e/Uno/HelloUnoWorld.Droid/Properties/AndroidManifest.xml b/e2e/Uno/HelloUnoWorld.Droid/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.prismlibrary.helloworld" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
-	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="29" />
 	<uses-permission android:name="android.permission.INTERNET" />
 	<application android:label="HelloUnoWorld"></application>
 </manifest>
diff --git a/e2e/Uno/ModuleA/ModuleA.csproj b/e2e/Uno/ModuleA/ModuleA.csproj
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;xamarinios10;monoandroid80;monoandroid90</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid10.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
     <!-- Ensures the .xr.xml files are generated in a proper layout folder -->
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='monoandroid80' or '$(TargetFramework)'=='monoandroid90' or '$(TargetFramework)'=='netstandard2.0'">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('xamarinios')) or $(TargetFramework.StartsWith('xamarinmac')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('netstandard'))">
     <PackageReference Include="Uno.UI" />
   </ItemGroup>
   <ItemGroup>
@@ -21,22 +21,9 @@
   <ItemGroup>
     <UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
   </ItemGroup>
-  <ItemGroup>
-    <UpToDateCheckInput Remove="ModulePageA.xaml" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Prism.Core\Prism.Core.csproj" />
     <ProjectReference Include="..\..\..\src\Uno\Prism.DryIoc.Uno\Prism.DryIoc.Uno.csproj" />
     <ProjectReference Include="..\..\..\src\Uno\Prism.Uno\Prism.Uno.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="ModulePageA.xaml.cs">
-      <DependentUpon>ModulePageA.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="ModulePageA.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-  </ItemGroup>
 </Project>
diff --git a/global.json b/global.json
@@ -1,11 +1,11 @@
 {
   "sdk": {
-    "version": "5.0.101",
+    "version": "5.0.102",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   },
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "2.1.2",
+    "MSBuild.Sdk.Extras": "3.0.23",
     "Microsoft.Build.CentralPackageVersions": "2.0.79"
   }
 }
diff --git a/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.csproj b/src/Uno/Prism.DryIoc.Uno/Prism.DryIoc.Uno.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;xamarinios10;monoandroid90;xamarinmac20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid10.0;xamarinmac20</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
     <DefineConstants>$(DefineConstants);HAS_WINUI</DefineConstants>
     <NoWarn>$(NoWarn);1591</NoWarn>
@@ -20,7 +20,7 @@ Prism provides an implementation of a collection of design patterns that are hel
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='xamarinmac20' or '$(TargetFramework)'=='monoandroid90' or '$(TargetFramework)'=='netstandard2.0'">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('xamarinios')) or $(TargetFramework.StartsWith('xamarinmac')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('netstandard'))">
     <PackageReference Include="Uno.UI" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Uno/Prism.Unity.Uno/Prism.Unity.Uno.csproj b/src/Uno/Prism.Unity.Uno/Prism.Unity.Uno.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;xamarinios10;monoandroid90;xamarinmac20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid10.0;xamarinmac20</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
     <DefineConstants>$(DefineConstants);HAS_WINUI</DefineConstants>
     <RootNamespace>Prism.Unity</RootNamespace>
@@ -22,7 +22,7 @@ Prism provides an implementation of a collection of design patterns that are hel
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='xamarinmac20' or '$(TargetFramework)'=='monoandroid90' or '$(TargetFramework)'=='netstandard2.0'">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('xamarinios')) or $(TargetFramework.StartsWith('xamarinmac')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('netstandard'))">
     <PackageReference Include="Uno.UI" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/Uno/Prism.Uno/Prism.Uno.csproj b/src/Uno/Prism.Uno/Prism.Uno.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;xamarinios10;monoandroid90;xamarinmac20</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;xamarinios10;MonoAndroid10.0;xamarinmac20</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
     <GenerateLibraryLayout>true</GenerateLibraryLayout>
     <RootNamespace>Prism</RootNamespace>
@@ -17,7 +17,7 @@ Prism for Uno Platform helps you more easily design and build rich, flexible, an
   <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='xamarinios10' or '$(TargetFramework)'=='xamarinmac20' or '$(TargetFramework)'=='monoandroid90' or '$(TargetFramework)'=='netstandard2.0'">
+  <ItemGroup Condition="$(TargetFramework.StartsWith('xamarinios')) or $(TargetFramework.StartsWith('xamarinmac')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('netstandard'))">
     <PackageReference Include="Uno.UI" />
     <PackageReference Include="Uno.Core" />
     <PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" />