-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix/ScrollViewerShiftAndPointerWheel
- Loading branch information
Showing
88 changed files
with
2,290 additions
and
1,017 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup> | ||
| <PackageReference Include="System.Drawing.Common" Version="4.5.0" /> | ||
| <PackageReference Condition="'$(TargetFramework)'!='netstandard2.0'" Include="System.Drawing.Common" Version="6.0.0" /> | ||
| <PackageReference Condition="'$(TargetFramework)'=='netstandard2.0'" Include="System.Drawing.Common" Version="4.5.0" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
173 changes: 20 additions & 153 deletions
173
samples/ControlCatalog.Android/ControlCatalog.Android.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,165 +1,32 @@ | ||
| <?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>{29132311-1848-4FD6-AE0C-4FF841151BD3}</ProjectGuid> | ||
| <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> | ||
| <OutputType>Library</OutputType> | ||
| <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| <RootNamespace>ControlCatalog.Android</RootNamespace> | ||
| <AssemblyName>ControlCatalog.Android</AssemblyName> | ||
| <FileAlignment>512</FileAlignment> | ||
| <AndroidApplication>true</AndroidApplication> | ||
| <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile> | ||
| <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies> | ||
| <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk> | ||
| <TargetFrameworkVersion>v11.0</TargetFrameworkVersion> | ||
| <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> | ||
| <TargetFramework>net6.0-android</TargetFramework> | ||
| <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion> | ||
| <OutputType>Exe</OutputType> | ||
| <Nullable>enable</Nullable> | ||
| <ApplicationId>com.Avalonia.ControlCatalog</ApplicationId> | ||
| <ApplicationVersion>1</ApplicationVersion> | ||
| <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion> | ||
| <AndroidPackageFormat>apk</AndroidPackageFormat> | ||
| <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver> | ||
| </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> | ||
| <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime> | ||
| <AndroidLinkMode>None</AndroidLinkMode> | ||
| <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> | ||
| <BundleAssemblies>False</BundleAssemblies> | ||
| <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> | ||
| <AndroidSupportedAbis>armeabi-v7a;x86;x86_64</AndroidSupportedAbis> | ||
| <Debugger>Xamarin</Debugger> | ||
| <AndroidEnableMultiDex>False</AndroidEnableMultiDex> | ||
| <AotAssemblies>False</AotAssemblies> | ||
| <EnableLLVM>False</EnableLLVM> | ||
| <EnableProguard>False</EnableProguard> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | ||
| <DebugType>pdbonly</DebugType> | ||
| <Optimize>true</Optimize> | ||
| <OutputPath>bin\Release\</OutputPath> | ||
| <DefineConstants>TRACE</DefineConstants> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| <WarningLevel>4</WarningLevel> | ||
| <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime> | ||
| <AndroidLinkMode>Full</AndroidLinkMode> | ||
| <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk> | ||
| <BundleAssemblies>False</BundleAssemblies> | ||
| <AndroidCreatePackagePerAbi>False</AndroidCreatePackagePerAbi> | ||
| <AndroidSupportedAbis>armeabi-v7a,x86;x86_64</AndroidSupportedAbis> | ||
| <Debugger>Xamarin</Debugger> | ||
| <AotAssemblies>False</AotAssemblies> | ||
| <EnableLLVM>False</EnableLLVM> | ||
| <AndroidEnableMultiDex>False</AndroidEnableMultiDex> | ||
| <EnableProguard>False</EnableProguard> | ||
| <DebugSymbols>False</DebugSymbols> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Mono.Android" /> | ||
| <Reference Include="mscorlib" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="System.Xml.Linq" /> | ||
| <Reference Include="System.Xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="MainActivity.cs" /> | ||
| <Compile Include="Resources\Resource.Designer.cs" /> | ||
| <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| <Compile Include="SplashActivity.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="Resources\AboutResources.txt" /> | ||
| <None Include="Assets\AboutAssets.txt" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <AndroidResource Include="Resources\drawable\splash_screen.xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <AndroidResource Include="Resources\values\colors.xml" /> | ||
| <AndroidResource Include="Resources\values\styles.xml" /> | ||
| <None Remove="Assets\AboutAssets.txt" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <AndroidResource Include="..\..\build\Assets\Icon.png"> | ||
| <Link>Resources\drawable\Icon.png</Link> | ||
| </AndroidResource> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)'=='Release' and '$(TF_BUILD)' == ''"> | ||
| <DebugSymbols>True</DebugSymbols> | ||
| <RunAOTCompilation>True</RunAOTCompilation> | ||
| <EnableLLVM>True</EnableLLVM> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="Properties\AndroidManifest.xml" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj"> | ||
| <Project>{7B92AF71-6287-4693-9DCB-BD5B6E927E23}</Project> | ||
| <Name>Avalonia.Android</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Animation\Avalonia.Animation.csproj"> | ||
| <Project>{d211e587-d8bc-45b9-95a4-f297c8fa5200}</Project> | ||
| <Name>Avalonia.Animation</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj"> | ||
| <Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project> | ||
| <Name>Avalonia.Base</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj"> | ||
| <Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project> | ||
| <Name>Avalonia.Controls</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj"> | ||
| <Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project> | ||
| <Name>Avalonia.Diagnostics</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Input\Avalonia.Input.csproj"> | ||
| <Project>{62024b2d-53eb-4638-b26b-85eeaa54866e}</Project> | ||
| <Name>Avalonia.Input</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Interactivity\Avalonia.Interactivity.csproj"> | ||
| <Project>{6b0ed19d-a08b-461c-a9d9-a9ee40b0c06b}</Project> | ||
| <Name>Avalonia.Interactivity</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Layout\Avalonia.Layout.csproj"> | ||
| <Project>{42472427-4774-4c81-8aff-9f27b8e31721}</Project> | ||
| <Name>Avalonia.Layout</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Themes.Fluent\Avalonia.Themes.Fluent.csproj"> | ||
| <Project>{c42d2fc1-a531-4ed4-84b9-89aec7c962fc}</Project> | ||
| <Name>Avalonia.Themes.Fluent</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Visuals\Avalonia.Visuals.csproj"> | ||
| <Project>{eb582467-6abb-43a1-b052-e981ba910e3a}</Project> | ||
| <Name>Avalonia.Visuals</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Styling\Avalonia.Styling.csproj"> | ||
| <Project>{f1baa01a-f176-4c6a-b39d-5b40bb1b148f}</Project> | ||
| <Name>Avalonia.Styling</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj"> | ||
| <Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project> | ||
| <Name>Avalonia.Themes.Default</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj"> | ||
| <Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project> | ||
| <Name>Avalonia.Markup.Xaml</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj"> | ||
| <Project>{6417e941-21bc-467b-a771-0de389353ce6}</Project> | ||
| <Name>Avalonia.Markup</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj"> | ||
| <Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project> | ||
| <Name>Avalonia.Skia</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"> | ||
| <Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project> | ||
| <Name>ControlCatalog</Name> | ||
| </ProjectReference> | ||
| <ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj" /> | ||
| <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" /> | ||
| </ItemGroup> | ||
| <Import Project="..\..\build\Rx.props" /> | ||
| <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" /> | ||
| <Import Project="..\..\build\AndroidWorkarounds.props" /> | ||
| <Import Project="..\..\build\LegacyProject.targets" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
samples/ControlCatalog.Android/Properties/AndroidManifest.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="ControlCatalog.Android" android:versionCode="1" android:versionName="1.0" android:installLocation="auto"> | ||
| <uses-sdk android:targetSdkVersion="30" /> | ||
| <application android:label="ControlCatalog.Android"></application> | ||
| </manifest> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto"> | ||
| <application android:label="ControlCatalog.Android" android:icon="@drawable/Icon"></application> | ||
| </manifest> |
Oops, something went wrong.