Add .NET 6 android target to core

This commit is contained in:
Ivan Matkov 2022-08-03 12:42:30 +02:00
Родитель 3753806525
Коммит 1b1eebe952
4 изменённых файлов: 126 добавлений и 84 удалений

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

@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AppCenterCrashes", "AppCent
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter", "SDK\AppCenter\Microsoft.AppCenter\Microsoft.AppCenter.csproj", "{3FE04B97-48DE-4895-8612-ECBDFEBD917C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter.Android", "SDK\AppCenter\Microsoft.AppCenter.Android\Microsoft.AppCenter.Android.csproj", "{119C1730-E109-4BC9-AA89-9DCA2C50BFD5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter.Android.Xamarin", "SDK\AppCenter\Microsoft.AppCenter.Android\Microsoft.AppCenter.Android.Xamarin.csproj", "{119C1730-E109-4BC9-AA89-9DCA2C50BFD5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter.iOS", "SDK\AppCenter\Microsoft.AppCenter.iOS\Microsoft.AppCenter.iOS.csproj", "{B87370CD-AF51-45E0-AA15-3E0ABC0C30A0}"
EndProject
@ -89,6 +89,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter.Crashes
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter.Distribute.AppleUnified", "SDK\AppCenterDistribute\Microsoft.AppCenter.Distribute.AppleUnified\Microsoft.AppCenter.Distribute.AppleUnified.csproj", "{416D42EC-CD5D-42FF-BC16-E2E66C38FDAE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AppCenter.Android", "SDK\AppCenter\Microsoft.AppCenter.Android\Microsoft.AppCenter.Android.csproj", "{B4868C2D-9475-4AF9-9E23-5501EA6468E7}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
SDK\AppCenter\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems*{119c1730-e109-4bc9-aa89-9dca2c50bfd5}*SharedItemsImports = 4
@ -1805,6 +1807,60 @@ Global
{416D42EC-CD5D-42FF-BC16-E2E66C38FDAE}.GooglePlay|x64.Build.0 = Release|Any CPU
{416D42EC-CD5D-42FF-BC16-E2E66C38FDAE}.GooglePlay|x86.ActiveCfg = Release|Any CPU
{416D42EC-CD5D-42FF-BC16-E2E66C38FDAE}.GooglePlay|x86.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|ARM.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|iPhone.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|x64.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|x64.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|x86.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.AppStore|x86.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|ARM.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|iPhone.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|x64.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|x64.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|x86.ActiveCfg = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Debug|x86.Build.0 = Debug|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|Any CPU.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|ARM.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|ARM.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|iPhone.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|iPhone.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|x64.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|x64.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|x86.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.Release|x86.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.GooglePlay|Any CPU.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.GooglePlay|Any CPU.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.GooglePlay|x64.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.GooglePlay|x64.Build.0 = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.GooglePlay|x86.ActiveCfg = Release|Any CPU
{B4868C2D-9475-4AF9-9E23-5501EA6468E7}.GooglePlay|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -1851,6 +1907,7 @@ Global
{2B8DAB16-91E2-4EFB-ADFB-CA87F7B97A85} = {13744327-9529-490B-A970-06A1D3144117}
{B062D990-A256-4E0A-88C7-14B1C1216283} = {7FAAA086-4453-4B62-AD9A-2E2ED216E3C4}
{416D42EC-CD5D-42FF-BC16-E2E66C38FDAE} = {B0562DBB-3784-4F1C-A355-61CFD44ED963}
{B4868C2D-9475-4AF9-9E23-5501EA6468E7} = {13744327-9529-490B-A970-06A1D3144117}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
Policies = $0

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

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="MSBuild.Sdk.Extras/3.0.44">
<PropertyGroup>
<ProjectGuid>{119C1730-E109-4BC9-AA89-9DCA2C50BFD5}</ProjectGuid>
<TargetFramework>MonoAndroid10.0</TargetFramework>
<IsBindingProject>true</IsBindingProject>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidClassParser>class-parse</AndroidClassParser>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.AppCenter.xml</DocumentationFile>
<LangVersion>7.0</LangVersion>
<NoWarn>1591</NoWarn>
<!-- Assembly information. -->
<Company>Microsoft Corporation</Company>
<Copyright>Microsoft Corp. All rights reserved.</Copyright>
<Product>Microsoft.AppCenter.Core</Product>
<Company>Microsoft Corporation</Company>
<Version>4.6.0-SNAPSHOT</Version>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<FileVersion>4.6.0.0</FileVersion>
<RootNamespace>Microsoft.AppCenter</RootNamespace>
<AssemblyName>Microsoft.AppCenter</AssemblyName>
<AssemblyTitle>Microsoft.AppCenter.Core</AssemblyTitle>
<!-- Signing. -->
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\..\..\appcenter-public-key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\Metadata.xml">
<SubType>Designer</SubType>
</TransformFile>
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="..\..\..\externals\android\appcenter-release.aar">
<Link>Jars\appcenter-release.aar</Link>
</LibraryProjectZip>
</ItemGroup>
<Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
<Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
</Project>

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

@ -1,71 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{119C1730-E109-4BC9-AA89-9DCA2C50BFD5}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<TargetFrameworks>net6.0-android</TargetFrameworks>
<SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
<AndroidBoundInterfacesContainTypes>false</AndroidBoundInterfacesContainTypes>
<AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.AppCenter.xml</DocumentationFile>
<LangVersion>7.0</LangVersion>
<NoWarn>1591</NoWarn>
<!-- Assembly information. -->
<Copyright>Microsoft Corp. All rights reserved.</Copyright>
<Product>Microsoft.AppCenter.Core</Product>
<Company>Microsoft Corporation</Company>
<Version>4.6.0-SNAPSHOT</Version>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
<FileVersion>4.6.0.0</FileVersion>
<RootNamespace>Microsoft.AppCenter</RootNamespace>
<AssemblyName>Microsoft.AppCenter</AssemblyName>
<FileAlignment>512</FileAlignment>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
<AndroidClassParser>class-parse</AndroidClassParser>
<AndroidTlsProvider>
</AndroidTlsProvider>
<AssemblyTitle>Microsoft.AppCenter.Core</AssemblyTitle>
<!-- Signing. -->
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>..\..\..\appcenter-public-key.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Microsoft.AppCenter.xml</DocumentationFile>
<NoWarn>CS1591;CS0109</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType></DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\Microsoft.AppCenter.xml</DocumentationFile>
<NoWarn>CS1591;CS0109</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="AppCenter.cs" />
<Compile Include="AppCenterLog.cs" />
<Compile Include="Device.cs" />
<Compile Include="DependencyConfiguration.cs" />
<Compile Include="AndroidHttpClientAdapter.cs" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\Metadata.xml">
<SubType>Designer</SubType>
</TransformFile>
</ItemGroup>
<ItemGroup>
<LibraryProjectZip Include="..\..\..\externals\android\appcenter-release.aar">
<AndroidLibrary Include="..\..\..\externals\android\appcenter-release.aar">
<Link>Jars\appcenter-release.aar</Link>
</LibraryProjectZip>
</AndroidLibrary>
</ItemGroup>
<Import Project="..\Microsoft.AppCenter.Shared.Xamarin\Microsoft.AppCenter.Shared.Xamarin.projitems" Label="Shared" />
<Import Project="..\Microsoft.AppCenter.Shared\Microsoft.AppCenter.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
</Project>

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

@ -1,34 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("Microsoft.AppCenter.Android")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyProduct("Microsoft.AppCenter.Android")]
[assembly: AssemblyCopyright("Microsoft Corp. All rights reserved.")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.0.0.0")]
[assembly: AssemblyFileVersion("4.6.0.0")]
[assembly: AssemblyInformationalVersion("4.6.0-SNAPSHOT")]
[assembly: InternalsVisibleTo("Microsoft.AppCenter.Test.Functional, PublicKey=002400000480000094000000060200000024000052534131000400000100010055c4e2f76a6f3430448b1fd5b9ced790181e698a86759ece168bd955efc4297c9f89a303204019a9d2e8e92d204ba87e4825b36f8ba08113dc7297dcebe3d2bc15fabeae1d8c71d69769adedbc37ba7e197efc537cac2d477772ab38c4d4ccee45ddf99ce4343e9b665b663280c4dae2520b508bc7de0faf1978934f094d68e3")]