Commit 00983066 authored by Paolo Pecis's avatar Paolo Pecis

Solved merge problems

parent 0d9a7de4

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

{
"version": 1,
"dgSpecHash": "FDR0o9Kt/0Wg1cE+S7C0zGJHk/kq6AiP/b7BRJ+cu06e0vHx8j+2cDd+dlCpwBiXPmY7Pr9BWmQRUXpqac+eig==",
"success": true
}
\ No newline at end of file
{
"format": 1,
"restore": {
"/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility.Android/CustomViewAccessibility.Android.csproj": {}
},
"projects": {
"/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility.Android/CustomViewAccessibility.Android.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility.Android/CustomViewAccessibility.Android.csproj",
"projectName": "CustomViewAccessibility.Android",
"projectPath": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility.Android/CustomViewAccessibility.Android.csproj",
"packagesPath": "/Users/mattiaducci/.nuget/packages/",
"outputPath": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility.Android/obj/",
"projectStyle": "PackageReference",
"skipContentFileWrite": true,
"configFilePaths": [
"/Users/mattiaducci/.config/NuGet/NuGet.Config"
],
"originalTargetFrameworks": [
"monoandroid90"
],
"sources": {
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"monoandroid90": {
"projectReferences": {
"/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility/CustomViewAccessibility.csproj": {
"projectPath": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility/CustomViewAccessibility.csproj"
}
}
}
}
},
"frameworks": {
"monoandroid90": {
"dependencies": {
"Xamarin.Android.Support.Core.Utils": {
"target": "Package",
"version": "[28.0.0.3, )"
},
"Xamarin.Essentials": {
"target": "Package",
"version": "[1.3.1, )"
},
"Xamarin.Forms": {
"target": "Package",
"version": "[4.4.0.991537, )"
}
}
}
}
},
"/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility/CustomViewAccessibility.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility/CustomViewAccessibility.csproj",
"projectName": "CustomViewAccessibility",
"projectPath": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility/CustomViewAccessibility.csproj",
"packagesPath": "/Users/mattiaducci/.nuget/packages/",
"outputPath": "/Users/mattiaducci/Desktop/Lavoro/UNIMI/UIST-2020/mobilescreenreadersapi/AccessibleView/XAMARINCustomViewAccessibility/CustomViewAccessibility/obj/",
"projectStyle": "PackageReference",
"configFilePaths": [
"/Users/mattiaducci/.config/NuGet/NuGet.Config"
],
"originalTargetFrameworks": [
"netstandard2.0"
],
"sources": {
"https://api.nuget.org/v3/index.json": {}
},
"frameworks": {
"netstandard2.0": {
"projectReferences": {}
}
},
"warningProperties": {
"warnAsError": [
"NU1605"
]
}
},
"frameworks": {
"netstandard2.0": {
"dependencies": {
"NETStandard.Library": {
"suppressParent": "All",
"target": "Package",
"version": "[2.0.3, )",
"autoReferenced": true
},
"Xamarin.Essentials": {
"target": "Package",
"version": "[1.3.1, )"
},
"Xamarin.Forms": {
"target": "Package",
"version": "[4.4.0.991537, )"
}
},
"imports": [
"net461",
"net462",
"net47",
"net471",
"net472",
"net48"
],
"assetTargetFallback": true,
"warn": true,
"runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/3.1.200/RuntimeIdentifierGraph.json"
}
}
}
}
}
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/mattiaducci/.nuget/packages/</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/mattiaducci/.nuget/packages/</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.4.0</NuGetToolVersion>
</PropertyGroup>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)xamarin.forms/4.4.0.991537/build/Xamarin.Forms.props" Condition="Exists('$(NuGetPackageRoot)xamarin.forms/4.4.0.991537/build/Xamarin.Forms.props')" />
</ImportGroup>
</Project>
\ No newline at end of file
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute("MonoAndroid,Version=v9.0", FrameworkDisplayName = "Xamarin.Android v9.0 Support")]
This source diff could not be displayed because it is too large. You can view the blob instead.
<?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.companyname.customviewaccessibility">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application android:label="CustomViewAccessibility.Android" android:name="android.app.Application" android:allowBackup="true" android:icon="@mipmap/icon" android:debuggable="true">
<activity android:configChanges="orientation|screenSize" android:icon="@mipmap/icon" android:label="CustomViewAccessibility" android:theme="@style/MainTheme" android:name="crc643b74491a81d4cb6f.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<service android:name="crc64a98abb514ffad9f1.KeepAliveService" />
<receiver android:enabled="true" android:exported="false" android:label="Essentials Battery Broadcast Receiver" android:name="crc64a0e0a82d0db9a07d.BatteryBroadcastReceiver" />
<receiver android:enabled="true" android:exported="false" android:label="Essentials Energy Saver Broadcast Receiver" android:name="crc64a0e0a82d0db9a07d.EnergySaverBroadcastReceiver" />
<receiver android:enabled="true" android:exported="false" android:label="Essentials Connectivity Broadcast Receiver" android:name="crc64a0e0a82d0db9a07d.ConnectivityBroadcastReceiver" />
<provider android:authorities="com.companyname.customviewaccessibility.fileProvider" android:exported="false" android:grantUriPermissions="true" android:name="xamarin.essentials.fileProvider">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/xamarin_essentials_fileprovider_file_paths" />
</provider>
<receiver android:enabled="true" android:exported="false" android:name="crc643f46942d9dd1fff9.PowerSaveModeBroadcastReceiver" />
<provider android:name="mono.MonoRuntimeProvider" android:exported="false" android:initOrder="1999999999" android:authorities="com.companyname.customviewaccessibility.mono.MonoRuntimeProvider.__mono_init__" />
<!--suppress ExportedReceiver-->
<receiver android:name="mono.android.Seppuku">
<intent-filter>
<action android:name="mono.android.intent.action.SEPPUKU" />
<category android:name="mono.android.intent.category.SEPPUKU.com.companyname.customviewaccessibility" />
</intent-filter>
</receiver>
</application>
</manifest>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment