unoplatform
/
uno
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

feat: Add net6 support

This commit is contained in:
Jerome Laban 2021-04-14 16:07:58 -04:00
Родитель c09c8ea06a
Коммит 24275447be
73 изменённых файлов: 12315 добавлений и 163 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
.vsts-ci.yml
Просмотреть файл

@ -41,7 +41,19 @@ variables:
XamarinSDKVersion_iOS_UITests: 6_10_0
jobs:
- template: build/ci/.azure-devops-windows.yml
- template: build/ci/.azure-devops-package-generic.yml
parameters:
poolName: '$(windowsScaledPool)'
- template: build/ci/.azure-devops-package-net6-win.yml
parameters:
poolName: '$(windowsScaledPool)'
# - template: build/ci/.azure-devops-package-net6-mac.yml
# parameters:
# vmImage: '$(macOSVMImage)'
- template: build/ci/.azure-devops-package.yml
parameters:
poolName: '$(windowsScaledPool)'

147
build/Uno.UI.Build.csproj
Просмотреть файл

@ -43,28 +43,51 @@
<Warning Text="Building this project under Visual Studio has no effect." />
</Target>
<Target Name="UnoBuild" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Target Name="BuildGeneric" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />
<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
<CallTarget Targets="RunAPISyncTool" Condition="'$(UNO_UWP_BUILD)'=='false'" />
<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
<CallTarget Targets="BuildCImacOS" Condition="'$(Configuration)'=='Release' and !$(_isWindows)" />
<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
<CallTarget Targets="PublishVisx" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
</Target>
<Target Name="UpdateFileVersions">
<Target Name="BuildNet6" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />
<XmlUpdate XmlFileName="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\source.extension.vsixmanifest"
XPath="/x:PackageManifest/x:Metadata/x:Identity/@Version"
<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
<CallTarget Targets="RunAPISyncTool" Condition="'$(UNO_UWP_BUILD)'=='false'" />
</Target>
<Target Name="GeneratePackages" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />
<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
</Target>
<Target Name="UpdateFileVersions">
<PropertyGroup>
<VSXNamespace>
<Namespace Prefix="x" Uri="http://schemas.microsoft.com/developer/vsx-schema/2011"/>
</VSXNamespace>
<MSBuildDeveloperNamespace>
<Namespace Prefix="x" Uri="http://schemas.microsoft.com/developer/msbuild/2003"/>
</MSBuildDeveloperNamespace>
</PropertyGroup>
<XmlPoke XmlInputPath="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\source.extension.vsixmanifest"
Query="/x:PackageManifest/x:Metadata/x:Identity/@Version"
Value="$(GITVERSION_MajorMinorPatch).$(GITVERSION_CommitsSinceVersionSource)"
Namespace="http://schemas.microsoft.com/developer/vsx-schema/2011"
Prefix="x" />
Namespaces="$(VSXNamespace)"
/>
<ItemGroup>
<_PackageToUpdate Include="Uno.UI" />
@ -84,41 +107,41 @@
<_sdkProject Include="..\src\SolutionTemplate\Uno.ProjectTemplates.Dotnet\content\unolib-crossruntime\UnoCrossRuntimeLib\*.csproj"/>
</ItemGroup>
<XmlUpdate XmlFileName="%(_legacyProject.Identity)"
XPath="//x:PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
<XmlPoke XmlInputPath="%(_legacyProject.Identity)"
Query="//x:PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
Value="$(GitVersion_SemVer)"
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="x" />
Namespaces="$(MSBuildDeveloperNamespace)"
/>
<XmlUpdate XmlFileName="%(_legacyProject.Identity)"
XPath="//x:PackageReference[@Include='Uno.UI']/@Version"
<XmlPoke XmlInputPath="%(_legacyProject.Identity)"
Query="//x:PackageReference[@Include='Uno.UI']/@Version"
Value="$(GitVersion_SemVer)"
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
Prefix="x" />
Namespaces="$(MSBuildDeveloperNamespace)"
/>
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.RemoteControl']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.WebAssembly']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.WebAssembly']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.Skia.Gtk']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Gtk']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.Skia.Linux.FrameBuffer']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Linux.FrameBuffer']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.Skia.Wpf']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Wpf']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.Skia.Tizen']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Skia.Tizen']/@Version"
Value="$(GitVersion_SemVer)" />
<XmlUpdate XmlFileName="%(_sdkProject.Identity)"
XPath="//PackageReference[@Include='Uno.UI.Runtime.WebAssembly']/@Version"
<XmlPoke XmlInputPath="%(_sdkProject.Identity)"
Query="//PackageReference[@Include='Uno.UI.Runtime.WebAssembly']/@Version"
Value="$(GitVersion_SemVer)" />
</Target>
@ -138,8 +161,18 @@
<Target Name="BuildCI">
<Exec Command="npm i" WorkingDirectory="..\src\SamplesApp\SamplesApp.Wasm.UITests" />
<MSBuild Properties="Configuration=Release_NoSamples;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest;PackageVersion=$(GITVERSION_SemVer)"
Projects="..\src\Uno.UI.sln"
<MSBuild Properties="Configuration=Release_NoSamples;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-generic;PackageVersion=$(GITVERSION_SemVer)"
Projects="..\src\Uno.UI-packages-no-net6.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />
</Target>
<Target Name="BuildCINet6">
<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-net6;PackageVersion=$(GITVERSION_SemVer)"
Projects="..\src\Uno.UI-net6-only.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />
@ -148,7 +181,7 @@
<Target Name="BuildSyncGenerator">
<!-- Restore the nuget packages for the whole solution -->
<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true" Projects="..\src\Uno.UI.sln" Targets="Restore" RebaseOutputs="false" BuildInParallel="true" />
<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true" Projects="..\src\Uno.UI-packages-no-net6.slnf" Targets="Restore" RebaseOutputs="false" BuildInParallel="true" />
<MSBuild Properties="Configuration=Release" Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj" Targets="Restore;Build" />
<ItemGroup>
@ -184,13 +217,15 @@
<Target Name="PublishVisx" Condition="'$(UNO_UWP_BUILD)'=='true'">
<Copy SourceFiles="..\src\SolutionTemplate\UnoSolutionTemplate.VISX\bin\Release\UnoSolutionTemplate.VSIX.vsix"
DestinationFiles="$(OutputDir)\vslatest\UnoPlatform-$(GITVERSION_SemVer).vsix" />
DestinationFiles="$(OutputDir)\vslatest-generic\UnoPlatform-$(GITVERSION_SemVer).vsix" />
</Target>
<Target Name="PrepareNuGetPackage">
<PropertyGroup>
<NugetNamespace>http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd</NugetNamespace>
<NugetNamespace>
<Namespace Prefix="x" Uri="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd" />
</NugetNamespace>
<PackageNamePrefix>Uno.WinUI</PackageNamePrefix>
<PackageNamePrefix Condition="'$(UNO_UWP_BUILD)'=='true'">Uno.UI</PackageNamePrefix>
</PropertyGroup>
@ -207,28 +242,28 @@
</ItemGroup>
<!-- Update the package version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies/x:dependency/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies/x:dependency/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update Uno.WinUI references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI']/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update Uno.Foundation.Runtime.WebAssembly references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.Foundation.Runtime.WebAssembly']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.Foundation.Runtime.WebAssembly']/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update Uno.Foundation.Runtime.WebAssembly references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.WebAssembly']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.WebAssembly']/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update Uno.WinUI.Runtime.Skia.Gtk references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Gtk']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Gtk']/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update Uno.WinUI.Runtime.Skia.Linux.FrameBuffer references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Linux.FrameBuffer']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<!-- Update Uno.WinUI.Runtime.Skia.Wpf references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Wpf']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Wpf']/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update Uno.WinUI.Runtime.Skia.Tizen references version -->
<XmlUpdate XmlFileName="%(_NuspecFiles.Identity)" XPath="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Tizen']/@version" Value="$(GITVERSION_SemVer)" Namespace="$(NugetNamespace)" Prefix="x" />
<XmlPoke XmlInputPath="%(_NuspecFiles.Identity)" Query="/x:package/x:metadata/x:dependencies//x:dependency[@id='Uno.WinUI.Runtime.Skia.Tizen']/@version" Value="$(GITVERSION_SemVer)" Namespaces="$(NugetNamespace)" />
<!-- Update package ID based on WinUI / UWP source tree -->
<XmlUpdate XmlFileName=".\Uno.WinUI.nuspec" XPath="/x:package/x:metadata/x:id" Value="$(PackageNamePrefix)" Namespace="$(NugetNamespace)" Prefix="x" />
@ -260,18 +295,18 @@
<!-- Adjust build targets file to match WinUI / UWP-->
<Move SourceFiles=".\uno.winui.targets" DestinationFiles=".\$(PackageNamePrefix).targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\Uno.WinUI.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.targets']/@src" Value="$(PackageNamePrefix).targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.targets']/@src" Value="$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<!-- Adjust build targets file for UAP -->
<XmlUpdate XmlFileName=".\Uno.WinUI.nuspec" XPath="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.16299\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.16299\$(PackageNamePrefix).targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\Uno.WinUI.nuspec" XPath="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.17763\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.17763\$(PackageNamePrefix).targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.16299\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.16299\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\Uno.WinUI.nuspec" Query="/x:package/x:files/x:file[@target='buildTransitive\uap10.0.17763\uno.winui.targets']/@target" Value="buildTransitive\uap10.0.17763\$(PackageNamePrefix).targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<!-- Skia GTK targets/props-->
<Move SourceFiles=".\uno.winui.Skia.Gtk.targets" DestinationFiles=".\$(PackageNamePrefix).Skia.Gtk.targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<Move SourceFiles=".\uno.winui.Skia.Gtk.props" DestinationFiles=".\$(PackageNamePrefix).Skia.Gtk.props" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.Skia.Gtk.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Gtk.targets']/@src" Value="$(PackageNamePrefix).Skia.Gtk.targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.Skia.Gtk.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Gtk.props']/@src" Value="$(PackageNamePrefix).Skia.Gtk.props" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.Skia.Gtk.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Gtk.targets']/@src" Value="$(PackageNamePrefix).Skia.Gtk.targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.Skia.Gtk.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Gtk.props']/@src" Value="$(PackageNamePrefix).Skia.Gtk.props" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<!-- Skia Linux FrameBuffer targets/props-->
<Move SourceFiles=".\uno.winui.Skia.Linux.FrameBuffer.targets" DestinationFiles=".\$(PackageNamePrefix).Skia.Linux.FrameBuffer.targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
@ -284,22 +319,22 @@
<Move SourceFiles=".\uno.winui.Skia.Tizen.targets" DestinationFiles=".\$(PackageNamePrefix).Skia.Tizen.targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<Move SourceFiles=".\uno.winui.Skia.Tizen.props" DestinationFiles=".\$(PackageNamePrefix).Skia.Tizen.props" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.Skia.Tizen.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Tizen.targets']/@src" Value="$(PackageNamePrefix).Skia.Tizen.targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.Skia.Tizen.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Tizen.props']/@src" Value="$(PackageNamePrefix).Skia.Tizen.props" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.Skia.Tizen.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Tizen.targets']/@src" Value="$(PackageNamePrefix).Skia.Tizen.targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.Skia.Tizen.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Tizen.props']/@src" Value="$(PackageNamePrefix).Skia.Tizen.props" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<!-- Skia Wpf targets/props-->
<Move SourceFiles=".\uno.winui.Skia.Wpf.targets" DestinationFiles=".\$(PackageNamePrefix).Skia.Wpf.targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<Move SourceFiles=".\uno.winui.Skia.Wpf.props" DestinationFiles=".\$(PackageNamePrefix).Skia.Wpf.props" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.Skia.Wpf.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Wpf.targets']/@src" Value="$(PackageNamePrefix).Skia.Wpf.targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.Skia.Wpf.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Wpf.props']/@src" Value="$(PackageNamePrefix).Skia.Wpf.props" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.Skia.Wpf.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Wpf.targets']/@src" Value="$(PackageNamePrefix).Skia.Wpf.targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.Skia.Wpf.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.Skia.Wpf.props']/@src" Value="$(PackageNamePrefix).Skia.Wpf.props" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<!-- Wasm targets/props-->
<Move SourceFiles=".\uno.winui.WebAssembly.targets" DestinationFiles=".\$(PackageNamePrefix).WebAssembly.targets" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<Move SourceFiles=".\uno.winui.WebAssembly.props" DestinationFiles=".\$(PackageNamePrefix).WebAssembly.props" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.WebAssembly.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.WebAssembly.targets']/@src" Value="$(PackageNamePrefix).WebAssembly.targets" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlUpdate XmlFileName=".\uno.winui.WebAssembly.nuspec" XPath="/x:package/x:files/x:file[@src='Uno.WinUI.WebAssembly.props']/@src" Value="$(PackageNamePrefix).WebAssembly.props" Namespace="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.WebAssembly.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.WebAssembly.targets']/@src" Value="$(PackageNamePrefix).WebAssembly.targets" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<XmlPoke XmlInputPath=".\uno.winui.WebAssembly.nuspec" Query="/x:package/x:files/x:file[@src='Uno.WinUI.WebAssembly.props']/@src" Value="$(PackageNamePrefix).WebAssembly.props" Namespaces="$(NugetNamespace)" Prefix="x" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<!-- remote control -->
<Move SourceFiles="..\src\Uno.UI.RemoteControl\buildTransitive\Uno.UI.RemoteControl.targets" DestinationFiles="..\src\Uno.UI.RemoteControl\buildTransitive\$(PackageNamePrefix).RemoteControl.targets" Condition="'$(UNO_UWP_BUILD)'!='true'"/>

33
build/Uno.WinUI.Lottie.nuspec
Просмотреть файл

@ -26,20 +26,35 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net6.0-ios">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net6.0-catalyst">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="xamarinios10">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<dependency id="System.Json" version="4.7.1" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="xamarinmac20">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net6.0-android">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.Android.Lottie" version="3.0.4" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
</group>
<group targetFramework="MonoAndroid11.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.Android.Lottie" version="3.0.4" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
@ -50,7 +65,15 @@
</dependencies>
<references>
<!-- .NET Standard 2.0 -->
<group targetFramework="net6.0-ios">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net6.0-maccatalyst">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net6.0-android">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="netstandard2.0">
<reference file="Uno.UI.Lottie.dll" />
</group>
@ -75,6 +98,10 @@
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinmac20\Uno.UI.Lottie.dll" target="lib\xamarinmac20" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid11.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid11.0" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid10.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid10.0" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-android\Uno.UI.Lottie.dll" target="lib\net6.0-android" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-ios\Uno.UI.Lottie.dll" target="lib\net6.0-ios" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-maccatalyst\Uno.UI.Lottie.dll" target="lib\net6.0-maccatalyst" />
<!-- Build targets -->
<file src="..\src\AddIns\Uno.UI.Lottie\buildTransitive\*" target="buildTransitive" />

45
build/Uno.WinUI.RemoteControl.nuspec
Просмотреть файл

@ -44,7 +44,28 @@
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
<!-- .NET Standard 2.0 -->
<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
<!-- net6.0-android -->
<group targetFramework="net6.0-android">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>
<!-- .NET Standard 2.0 -->
<group targetFramework="netstandard2.0">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
@ -79,6 +100,16 @@
<reference file="Uno.UI.RemoteControl.dll" />
</group>
<!-- .NET 6 Android -->
<group targetFramework="net6.0-android">
<reference file="Uno.UI.RemoteControl.dll" />
</group>
<!-- .NET 6 iOS -->
<group targetFramework="net6.0-ios">
<reference file="Uno.UI.RemoteControl.dll" />
</group>
</references>
</metadata>
@ -99,6 +130,15 @@
<file src="..\src\Uno.UI.RemoteControl\bin\Release\xamarinmac20\Uno.UI.RemoteControl.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.RemoteControl\bin\Release\xamarinmac20\Uno.UI.RemoteControl.pdb" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-android\Uno.UI.RemoteControl.dll" target="lib\net6.0-android" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-android\Uno.UI.RemoteControl.pdb" target="lib\net6.0-android" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-ios\Uno.UI.RemoteControl.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-ios\Uno.UI.RemoteControl.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-maccatalyst\Uno.UI.RemoteControl.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-maccatalyst\Uno.UI.RemoteControl.pdb" target="lib\net6.0-maccatalyst" />
<!-- Processors -->
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\Uno.UI.RemoteControl.Server.Processors.dll" target="tools\rc\processors" />
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\Uno.UI.RemoteControl.Server.Processors.pdb" target="tools\rc\processors" />
@ -118,8 +158,9 @@
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.pdb" target="tools\rc" />
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\Newtonsoft.Json.dll" target="tools\rc" />
<!-- Force UAP to ignore netstandard 2.0 -->
<!-- Force UAP/netx-win to ignore netstandard 2.0 -->
<file src="_._" target="build\uap10.0.16299" />
<file src="_._" target="build\uap10.0.17763" />
<file src="_._" target="build\net5.0-windows" />
</files>
</package>

117
build/Uno.WinUI.nuspec
Просмотреть файл

@ -15,6 +15,34 @@
<repository type="git" url="https://github.com/unoplatform/uno.git" branch="$branch$" commit="$commitid$" />
<dependencies>
<!-- net6.0-android30.0 -->
<group targetFramework="net6.0-android30.030">
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7-net6preview02.4535000" />
<dependency id="Xamarin.AndroidX.AppCompat" version="1.2.0.7-net6preview02.4535000" />
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0.8-net6preview02.4535000" />
<dependency id="Xamarin.AndroidX.Fragment" version="1.3.0.1-net6preview02.4535000" />
<dependency id="Uno.SourceGenerationTasks" version="3.1.0-dev.4" />
<dependency id="Uno.Core" version="2.4.0-dev.2" />
<dependency id="Uno.Core.Build" version="2.4.0-dev.2" />
<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
</group>
<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<dependency id="Uno.SourceGenerationTasks" version="3.1.0-dev.4" />
<dependency id="Uno.Core" version="2.4.0-dev.2" />
<dependency id="Uno.Core.Build" version="2.4.0-dev.2" />
<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
</group>
<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<dependency id="Uno.SourceGenerationTasks" version="3.1.0-dev.4" />
<dependency id="Uno.Core" version="2.4.0-dev.2" />
<dependency id="Uno.Core.Build" version="2.4.0-dev.2" />
<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
</group>
<!-- Android 11.0 -->
<group targetFramework="MonoAndroid11.0">
@ -104,6 +132,26 @@
<reference file="Uno.UI.FluentTheme.dll" />
</group>
<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<reference file="Uno.Xaml.dll" />
<reference file="Uno.UI.dll" />
<reference file="Uno.Foundation.dll" />
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
</group>
<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<reference file="Uno.Xaml.dll" />
<reference file="Uno.UI.dll" />
<reference file="Uno.Foundation.dll" />
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
</group>
<!-- macOS -->
<group targetFramework="xamarinmac20">
<reference file="Uno.Xaml.dll" />
@ -125,6 +173,17 @@
<reference file="Uno.UI.FluentTheme.dll" />
</group>
<!-- net6.0-android30.0 -->
<group targetFramework="net6.0-android30.0">
<reference file="Uno.UI.BindingHelper.Android.dll" />
<reference file="Uno.Xaml.dll" />
<reference file="Uno.UI.dll" />
<reference file="Uno.Foundation.dll" />
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
</group>
<!-- Windows -->
<group targetFramework="uap10.0.17763">
<reference file="Uno.UI.Toolkit.dll" />
@ -189,6 +248,53 @@
<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\Uno.UI.Toolkit.dll" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\Uno.UI.Toolkit.pdb" target="lib\xamarinios10" />
<!-- net6.0-ios -->
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Foundation.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Foundation.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.UI.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.UI.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Xaml.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Xaml.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-ios\*.xml" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-ios\Uno.UI.Toolkit.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-ios\Uno.UI.Toolkit.pdb" target="lib\net6.0-ios" />
<!-- net6.0-maccatalyst -->
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Foundation.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Foundation.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.UI.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.UI.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Xaml.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Xaml.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-maccatalyst\*.xml" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-maccatalyst\Uno.UI.Toolkit.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-maccatalyst\Uno.UI.Toolkit.pdb" target="lib\net6.0-maccatalyst" />
<!-- net6.0-android30.0 -->
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Foundation.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Foundation.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Xaml.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Xaml.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-android\*.xml" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-android\Uno.UI.Toolkit.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-android\Uno.UI.Toolkit.pdb" target="lib\net6.0-android30.0" />
<!-- macOS -->
<file src="..\src\Uno.UI\Bin\Release\xamarinmac20\Uno.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI\Bin\Release\xamarinmac20\Uno.pdb" target="lib\xamarinmac20" />
@ -283,16 +389,25 @@
<file src="Uno.WinUI.targets" target="buildTransitive\xamarinios10" />
<file src="Uno.WinUI.targets" target="buildTransitive\xamarinmac20" />
<file src="Uno.WinUI.targets" target="buildTransitive\netstandard2.0" />
<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-android30.0" />
<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-ios" />
<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-catalyst" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\MonoAndroid" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\xamarinios10" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\xamarinmac20" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\netstandard2.0" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-android30.0" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-ios" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-catalyst" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\MonoAndroid" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\xamarinios10" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\xamarinmac20" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\netstandard2.0" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-android30.0" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-ios" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-catalyst" />
<!-- Force UAP to ignore netstandard 2.0 -->
<file src="uno.winui.uap.targets" target="buildTransitive\uap10.0.16299\uno.winui.targets" />

114
build/ci/.azure-devops-package-generic.yml Normal file
Просмотреть файл

@ -0,0 +1,114 @@
parameters:
poolName: ''
jobs:
- job: generic_win_build
displayName: 'Build Generic Binaries'
timeoutInMinutes: 90
pool: ${{ parameters.poolName }}
strategy:
matrix:
UWP:
UNO_UWP_BUILD: true
XAML_FLAVOR_BUILD: UWP
WinUI:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
variables:
CombinedConfiguration: Release|Any CPU
CI_Build: true
# Disable .NET 5 build on CI for package generation
# Build validation is performed on other jobs
UnoUIDisableNetCoreBuild: true
# This is required to be able to use hard links as much as possible
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
steps:
- checkout: self
clean: true
- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)
- template: templates/gitversion.yml
- task: NuGetToolInstaller@0
inputs:
versionSpec: 4.9.1
checkLatest: false
# Required to run the api comparison tool
- task: UseDotNet@2
displayName: 'Use .Net Core runtime 2.2.x'
inputs:
packageType: runtime
version: 2.2.x
# Required for the Wasm uitests project
- task: NodeTool@0
- template: templates/install-windows-sdk.yml
- powershell: |
cd $(build.sourcesdirectory)\src\Uno.WinUIRevert
dotnet run "$(build.sourcesdirectory)"
condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
displayName: Convert source tree to WinUI 3 structure
- task: MSBuild@1
inputs:
solution: Build/Uno.UI.Build.csproj
msbuildLocationMethod: version
msbuildVersion: latest
msbuildArchitecture: x86
msbuildArguments: /r /m /t:BuildGeneric "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer).binlog
clean: false
restoreNugetPackages: false
logProjectEvents: false
createLogFile: false
- task: CopyFiles@2
condition: always()
inputs:
SourceFolder: $(build.sourcesdirectory)
Contents: |
**/bin/**/*.dll
**/bin/**/*.pdb
**/bin/**/*.xml
**/bin/**/*.xbf
**/bin/**/*.xaml
**/bin/**/*.vsix
TargetFolder: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD)
CleanTargetFolder: false
OverWrite: false
flattenFolders: false
- task: ArchiveFiles@2
inputs:
rootFolderOrFile: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD)
includeRootFolder: false
archiveType: 'zip'
archiveFile: '$(Build.ArtifactStagingDirectory)/windows-generic-bin-$(XAML_FLAVOR_BUILD).zip'
- task: PublishBuildArtifacts@1
condition: always()
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: NugetPackages-Artifacts
ArtifactType: Container
# - task: PublishBuildArtifacts@1
# displayName: Publish Tizen Artifacts
# condition: always()
# inputs:
# PathtoPublish: $(build.sourcesdirectory)\src\SamplesApp\SamplesApp.Skia.Tizen\bin\Release\tizen50
# ArtifactName: uno-tizen-artifacts
# ArtifactType: Container

132
build/ci/.azure-devops-package-net6-mac.yml Normal file
Просмотреть файл

@ -0,0 +1,132 @@
parameters:
vmImage: ''
jobs:
- job: net6_mac_build
displayName: 'Build .NET 6 Build (macOS)'
timeoutInMinutes: 90
pool:
vmImage: macOS-latest
strategy:
matrix:
UWP:
UNO_UWP_BUILD: true
XAML_FLAVOR_BUILD: UWP
WinUI:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
variables:
CombinedConfiguration: Release|Any CPU
CI_Build: true
# This is required to be able to use hard links as much as possible
NUGET_PACKAGES: $(Agent.WorkFolder)/.nuget
# net6 related
DotNetVersion: 6.0.100-preview.4.21226.14
DotNet.Cli.Telemetry.OptOut: true
MauiCheck.Version: 0.4.1
MauiCheck.Manifest: https://raw.githubusercontent.com/Redth/dotnet-maui-check/main/manifests/maui-dev.manifest.json
LogDirectory: $(Build.ArtifactStagingDirectory)/logs
DOTNET_ROOT: /usr/local/share/dotnet/
DotNet.Tools: ~/.dotnet/tools
steps:
- checkout: self
clean: true
- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)
- task: UseDotNet@2
displayName: 'Use .Net Core runtime 5.0.103'
inputs:
packageType: sdk
version: 5.0.103
installationPath: $(DOTNET_ROOT)
- task: UseDotNet@2
displayName: 'Use .Net Core runtime 3.1.406'
inputs:
packageType: sdk
version: 3.1.406
installationPath: $(DOTNET_ROOT)
- template: templates/gitversion.yml
parameters:
dotnetInstallationPath: $(DOTNET_ROOT)
#- bash: |
# set -x
# export PATH="$(DOTNET_ROOT):$(DotNet.Tools):$PATH"
# echo "##vso[task.setvariable variable=PATH]$PATH"
# curl -L https://raw.githubusercontent.com/dotnet/install-scripts/7a9d5dcab92cf131fc2d8977052f8c2c2d540e22/src/dotnet-install.sh > dotnet-install.sh
# sh dotnet-install.sh --version $(DotNetVersion) --install-dir $DOTNET_ROOT --verbose
# dotnet --list-sdks
# sudo touch $DOTNET_ROOT/sdk/6.0.100-preview.3.21202.5/EnableWorkloadResolver.sentinel
# displayName: Install .NET $(DotNetVersion)
- bash: >
dotnet tool update --global redth.net.maui.check --version $(MauiCheck.Version) --add-source https://api.nuget.org/v3/index.json &&
maui-check --ci --non-interactive --fix --skip androidsdk --skip xcode --skip vswin --skip vsmac --manifest $(MauiCheck.Manifest)
displayName: Install .NET Workloads
- bash: sudo xcode-select -s /Applications/Xcode_12.4.app
displayName: select Xcode 12.4
- bash: |
set -x
mkdir -p ~/Library/Preferences/Xamarin
rm -f ~/Library/Preferences/Xamarin/Settings.plist
/usr/libexec/PlistBuddy -c "add :AppleSdkRoot string $(dirname $(dirname $(xcode-select -p)))" ~/Library/Preferences/Xamarin/Settings.plist || true
cat ~/Library/Preferences/Xamarin/Settings.plist || true
displayName: configure vsmac xcode
- powershell: |
cd $(build.sourcesdirectory)/src/Uno.WinUIRevert
dotnet run "$(build.sourcesdirectory)"
condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
displayName: Convert source tree to WinUI 3 structure
- powershell: |
cp $(build.sourcesdirectory)/src/global-net6.json $(build.sourcesdirectory)/src/global.json
displayName: Change active .NET SDK for solution
- powershell: |
cd build
dotnet build Uno.UI.Build.csproj /t:BuildNet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)/build-$(GitVersion.FullSemVer).binlog
displayName: Setup versions
errorActionPreference: stop
- powershell: |
cd src
dotnet build Uno.UI-net6-only.slnf -c Release -f net6.0-maccatalyst "/p:PackageOutputPath=$(build.artifactstagingdirectory)/nuget" /bl:$(build.artifactstagingdirectory)/macos-build-$(GitVersion.FullSemVer)-net6-$(UNO_UWP_BUILD).binlog
displayName: Build
errorActionPreference: stop
- task: CopyFiles@2
condition: always()
inputs:
SourceFolder: $(build.sourcesdirectory)
Contents: |
**/bin/**/*.dll
**/bin/**/*.pdb
**/bin/**/*.xml
TargetFolder: $(build.artifactstagingdirectory)/mac-bin-$(XAML_FLAVOR_BUILD)
CleanTargetFolder: false
OverWrite: false
flattenFolders: false
- task: PublishBuildArtifacts@1
condition: always()
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: NugetPackages-Artifacts
ArtifactType: Container

113
build/ci/.azure-devops-package-net6-win.yml Normal file
Просмотреть файл

@ -0,0 +1,113 @@
parameters:
poolName: ''
jobs:
- job: net6_win_build
displayName: 'Build .NET 6 Build (Windows)'
timeoutInMinutes: 90
pool: ${{ parameters.poolName }}
strategy:
matrix:
UWP:
UNO_UWP_BUILD: true
XAML_FLAVOR_BUILD: UWP
WinUI:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
variables:
CombinedConfiguration: Release|Any CPU
CI_Build: true
# Disable .NET 5 build on CI for package generation
# Build validation is performed on other jobs
UnoUIDisableNetCoreBuild: true
# This is required to be able to use hard links as much as possible
NUGET_PACKAGES: $(Agent.WorkFolder)\.nuget
# net6 related
DotNetVersion: 6.0.100-preview.4.21255.9
MauiCheck.Version: 0.4.2
DotNet.Cli.Telemetry.OptOut: true
MauiCheck.Manifest: https://raw.githubusercontent.com/Redth/dotnet-maui-check/main/manifests/maui-dev.manifest.json
steps:
- checkout: self
clean: true
- template: templates/nuget-cache.yml
parameters:
nugetPackages: $(NUGET_PACKAGES)
- template: templates/gitversion.yml
## Required until .NET 6 installs properly on Windows using UseDotnet
- powershell: |
$ProgressPreference = 'SilentlyContinue'
Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile dotnet-install.ps1
& .\dotnet-install.ps1 -Version $(DotNetVersion) -InstallDir "$env:ProgramFiles\dotnet\" -Verbose
& dotnet --list-sdks
displayName: install .NET $(DotNetVersion)
errorActionPreference: stop
- powershell: |
& dotnet tool update --global redth.net.maui.check --version $(MauiCheck.Version) --add-source https://api.nuget.org/v3/index.json
& maui-check --ci --non-interactive --fix --skip androidsdk --skip xcode --skip vswin --skip vsmac --manifest $(MauiCheck.Manifest)
displayName: Install .NET 6 Workloads
errorActionPreference: stop
- template: templates/install-windows-sdk.yml
- powershell: |
cd $(build.sourcesdirectory)\src\Uno.WinUIRevert
dotnet run "$(build.sourcesdirectory)"
condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
displayName: Convert source tree to WinUI 3 structure
- powershell: |
cp $(build.sourcesdirectory)\src\global-net6.json $(build.sourcesdirectory)\src\global.json
displayName: Change active .NET SDK
- task: DotNetCoreCLI@2
inputs:
workingDirectory: Build
arguments: Uno.UI.Build.csproj /r /m /t:BuildNet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-net6-$(UNO_UWP_BUILD).binlog
- task: DotNetCoreCLI@2
inputs:
workingDirectory: Build
arguments: Uno.UI.Build.csproj /r /m /t:BuildCINet6 "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-net6-$(UNO_UWP_BUILD).binlog
- task: CopyFiles@2
condition: always()
inputs:
SourceFolder: $(build.sourcesdirectory)
Contents: |
**/bin/**/*.dll
**/bin/**/*.pdb
**/bin/**/*.xml
**/bin/**/*.xbf
**/bin/**/*.xaml
TargetFolder: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD)
CleanTargetFolder: false
OverWrite: false
flattenFolders: false
- task: ArchiveFiles@2
inputs:
rootFolderOrFile: $(build.sourcesdirectory)\build-artifacts\bin-$(XAML_FLAVOR_BUILD)
includeRootFolder: false
archiveType: 'zip'
archiveFile: '$(Build.ArtifactStagingDirectory)/windows-net6-bin-$(XAML_FLAVOR_BUILD).zip'
- task: PublishBuildArtifacts@1
condition: always()
inputs:
PathtoPublish: $(build.artifactstagingdirectory)
ArtifactName: NugetPackages-Artifacts
ArtifactType: Container

92
build/ci/.azure-devops-windows.yml → build/ci/.azure-devops-package.yml
Просмотреть файл

@ -2,19 +2,26 @@ parameters:
poolName: ''
jobs:
- job: VS_Latest
displayName: 'NuGet Packages'
- job: Generate_Packages
displayName: 'Pack NuGet'
timeoutInMinutes: 90
dependsOn:
- generic_win_build
- net6_win_build
# - net6_mac_build
pool: ${{ parameters.poolName }}
strategy:
matrix:
UWP:
UNO_UWP_BUILD: true
XAML_FLAVOR_BUILD: UWP
WinUI:
UNO_UWP_BUILD: false
XAML_FLAVOR_BUILD: WinUI
variables:
CombinedConfiguration: Release|Any CPU
@ -61,19 +68,33 @@ jobs:
condition: and(succeeded(), eq(variables['UNO_UWP_BUILD'], 'false'))
displayName: Convert source tree to WinUI 3 structure
- task: DownloadBuildArtifacts@0
inputs:
artifactName: NugetPackages-Artifacts
downloadPath: '$(Agent.WorkFolder)'
- task: ExtractFiles@1
displayName: Restore binaries structure
inputs:
archiveFilePatterns: '$(Agent.WorkFolder)/NugetPackages-Artifacts/*-bin-$(XAML_FLAVOR_BUILD).zip'
destinationFolder: $(build.sourcesdirectory)
cleanDestinationFolder: false
overwriteExistingFiles: true
- task: MSBuild@1
inputs:
solution: Build/Uno.UI.Build.csproj
msbuildLocationMethod: version
msbuildVersion: latest
msbuildArchitecture: x86
msbuildArguments: /r /m "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer).binlog
msbuildArguments: /r /m /t:GeneratePackages "/p:CombinedConfiguration=$(CombinedConfiguration)" /detailedsummary /bl:$(build.artifactstagingdirectory)\build-$(GitVersion.FullSemVer)-generate-packages.binlog
clean: false
restoreNugetPackages: false
logProjectEvents: false
createLogFile: false
- task: CopyFiles@2
displayName: Copy built packages
condition: always()
inputs:
SourceFolder: $(build.sourcesdirectory)/Build
@ -83,6 +104,30 @@ jobs:
OverWrite: false
flattenFolders: false
- task: CopyFiles@2
displayName: Copy generic build packages
condition: always()
inputs:
SourceFolder: $(Agent.WorkFolder)/NugetPackages-Artifacts/vslatest-generic
Contents: |
*.nupkg
*.vsix
TargetFolder: $(build.artifactstagingdirectory)\vslatest
CleanTargetFolder: false
OverWrite: false
flattenFolders: false
- task: CopyFiles@2
displayName: Copy net6 build packages
condition: always()
inputs:
SourceFolder: $(Agent.WorkFolder)/NugetPackages-Artifacts/vslatest-net6
Contents: '*.nupkg'
TargetFolder: $(build.artifactstagingdirectory)\vslatest
CleanTargetFolder: false
OverWrite: true
flattenFolders: false
- task: PowerShell@2
displayName: Authenticode Sign Packages
inputs:
@ -102,29 +147,18 @@ jobs:
ArtifactName: NugetPackages
ArtifactType: Container
- task: PublishBuildArtifacts@1
displayName: Publish Skia Artifacts
condition: always()
inputs:
PathtoPublish: $(build.sourcesdirectory)\src\SamplesApp\SamplesApp.Skia.Gtk\bin\Release\netcoreapp3.1
ArtifactName: uno-skia-artifacts
ArtifactType: Container
- task: PublishBuildArtifacts@1
displayName: Publish Tizen Artifacts
condition: always()
inputs:
PathtoPublish: $(build.sourcesdirectory)\src\SamplesApp\SamplesApp.Skia.Tizen\bin\Release\tizen50
ArtifactName: uno-tizen-artifacts
ArtifactType: Container
# Publish PR packages to local feed to enable canary testing from PR artifacts
# Temporarily disabled for quota considerations
#- task: NuGetCommand@2
# condition: and(eq(variables['System.PullRequest.IsFork'], 'False'), eq(variables['Build.Reason'], 'PullRequest'))
# inputs:
# command: 'push'
# packagesToPush: '$(build.artifactstagingdirectory)/vslatest/**/*.nupkg'
# nuGetFeedType: 'internal'
# publishVstsFeed: '1dd81cbd-cb35-41de-a570-b0df3571a196/a70dae92-4e3d-4540-bf93-9b22ec98d19d'
# allowPackageConflicts: true
# - task: PublishBuildArtifacts@1
# displayName: Publish Skia Artifacts
# condition: always()
# inputs:
# PathtoPublish: $(build.sourcesdirectory)\src\SamplesApp\SamplesApp.Skia.Gtk\bin\Release\netcoreapp3.1
# ArtifactName: uno-skia-artifacts
# ArtifactType: Container
#
# - task: PublishBuildArtifacts@1
# displayName: Publish Tizen Artifacts
# condition: always()
# inputs:
# PathtoPublish: $(build.sourcesdirectory)\src\SamplesApp\SamplesApp.Skia.Tizen\bin\Release\tizen50
# ArtifactName: uno-tizen-artifacts
# ArtifactType: Container

4
build/ci/.azure-devops-project-template-tests.yml
Просмотреть файл

@ -9,7 +9,7 @@ jobs:
pool:
vmImage: ${{ parameters.vmImageWindows }}
dependsOn: VS_Latest
dependsOn: Generate_Packages
steps:
- task: DownloadBuildArtifacts@0
@ -37,7 +37,7 @@ jobs:
container: unoplatform/wasm-build:2.3
dependsOn: VS_Latest
dependsOn: Generate_Packages
steps:
- task: DownloadBuildArtifacts@0

4
build/ci/templates/gitversion.yml
Просмотреть файл

@ -1,3 +1,5 @@
parameters:
dotnetInstallationPath: ''
steps:
@ -16,12 +18,14 @@ steps:
inputs:
packageType: runtime
version: 5.0.3
installationPath: '${{parameters.dotnetInstallationPath}}'
- task: UseDotNet@2
displayName: 'Use .Net Core runtime 3.1.12'
inputs:
packageType: runtime
version: 3.1.12
installationPath: '${{parameters.dotnetInstallationPath}}'
# Restore nuget.org to the list of existing sources, .NET 6 Pre 2 may somehow remove it
- powershell: |

11
build/global-net6.json Normal file
Просмотреть файл

@ -0,0 +1,11 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.22",
"Xamarin.Legacy.Sdk": "0.1.0-alpha2"
},
"sdk": {
"version": "6.0.100-preview.3.21202.5",
"rollForward": "disable",
"allowPrerelease": true
}
}

8
build/uno.winui.targets
Просмотреть файл

@ -226,7 +226,13 @@
</Target>
<Target Name="ValidateUnoUIAndroid" BeforeTargets="Build" Condition="'$(AndroidApplication)'!='' and '$(TargetFrameworkVersion)'!=''">
<PropertyGroup>
<PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
<UnoUIMinAndroidSDKVersion>30</UnoUIMinAndroidSDKVersion>
<_CurrentTrimmedAndroidSDLVersion>$(_AndroidApiLevel)</_CurrentTrimmedAndroidSDLVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(MSBuildRuntimeType)'!='Core'">
<UnoUIMinAndroidSDKVersion>10.0</UnoUIMinAndroidSDKVersion>
<_CurrentTrimmedAndroidSDLVersion>$(TargetFrameworkVersion.Substring(1))</_CurrentTrimmedAndroidSDLVersion>
</PropertyGroup>

2
src/AddIns/Uno.UI.Lottie/LottieVisualSource.iOSmacOS.cs
Просмотреть файл

@ -1,4 +1,4 @@
#if !NET6_0_IOS
#if !NET6_0
using System;
using System.Threading;
using Windows.Foundation;

62
src/AddIns/Uno.UI.Lottie/LottieVisualSourceBase.Android.cs
Просмотреть файл

@ -1,4 +1,5 @@
using System;
#if !NET6_0
using System;
using System.Threading;
using Android.Animation;
using Android.Widget;
@ -260,3 +261,62 @@ namespace Microsoft.Toolkit.Uwp.UI.Lottie
}
}
}
#else
using System;
using System.Threading;
using Windows.Foundation;
using Windows.UI.Xaml.Controls;
using System.Threading.Tasks;
using Uno.Disposables;
namespace Microsoft.Toolkit.Uwp.UI.Lottie
{
partial class LottieVisualSourceBase
{
public bool UseHardwareAcceleration { get; set; } = true;
async Task InnerUpdate(CancellationToken ct)
{
}
public void Play(double fromProgress, double toProgress, bool looped)
{
throw new NotImplementedException();
}
public void Stop()
{
throw new NotImplementedException();
}
public void Pause()
{
throw new NotImplementedException();
}
public void Resume()
{
throw new NotImplementedException();
}
public void SetProgress(double progress)
{
throw new NotImplementedException();
}
public void Load()
{
throw new NotImplementedException();
}
public void Unload()
{
throw new NotImplementedException();
}
private Size CompositionSize => default;
}
}
#endif

83
src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,83 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Deterministic>true</Deterministic>
<Nullable>enable</Nullable>
<AssemblyName>Uno.UI.Lottie</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<None Remove="buildTransitive\Uno.UI.Lottie.targets" />
</ItemGroup>
<ItemGroup>
<Content Include="buildTransitive\Uno.UI.Lottie.targets">
<PackagePath>build</PackagePath>
<Pack>true</Pack>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" />
<PackageReference Include="System.Json" />
</ItemGroup>
<Import Project="..\..\Common.targets" />
<Import Project="..\..\Uno.CrossTargetting.props" />
<ItemGroup>
<ProjectReference Include="..\..\Uno.UI\Uno.UI.net6.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-android'">
<!--<PackageReference Include="Com.Airbnb.Android.Lottie" Version="3.0.4" PrivateAssets="none" />-->
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-ios'">
<!--<PackageReference Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" PrivateAssets="none" />-->
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">
<!--<PackageReference Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" PrivateAssets="none" />-->
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>
<Import Project="..\..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
<Target Name="_UnoToolkitOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
<PropertyGroup>
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
<_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE)</_baseNugetPath>
<_baseNugetPath Condition="'$(HOME)'!=''">$(HOME)</_baseNugetPath>
<_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\Uno.UI.Lottie\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
</PropertyGroup>
<ItemGroup>
<_OutputFiles Include="$(TargetDir)**" />
</ItemGroup>
<MakeDir Directories="$(_TargetNugetFolder)" />
<Message Importance="high" Text="OVERRIDING NUGET PACKAGE CACHE: $(_TargetNugetFolder)" />
<Copy SourceFiles="@(_OutputFiles)" DestinationFiles="@(_OutputFiles->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(_OutputFilesPDB)" DestinationFiles="@(_OutputFilesPDB->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename).pdb')" />
</Target>
</Project>

4
src/AddIns/Uno.UI.MSAL/AbstractApplicationBuilderExtensions.cs
Просмотреть файл

@ -12,9 +12,9 @@ namespace Uno.UI.MSAL
public static T WithUnoHelpers<T>(this T builder)
where T : AbstractApplicationBuilder<T>
{
#if __ANDROID__ && !NET6_0_ANDROID
#if __ANDROID__ && !NET6_0_OR_GREATER
(builder as PublicClientApplicationBuilder)?.WithParentActivityOrWindow(() => ContextHelper.Current as Android.App.Activity);
#elif __IOS__ && !NET6_0_IOS
#elif __IOS__ && !NET6_0_OR_GREATER
(builder as PublicClientApplicationBuilder)?.WithParentActivityOrWindow(() => Windows.UI.Xaml.Window.Current.Content.Window.RootViewController);
#elif __WASM__
builder.WithHttpClientFactory(WasmHttpFactory.Instance);

85
src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,85 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<NoWarn>$(NoWarn);NU1701;NU5100;NU5118;NU5128</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Deterministic>true</Deterministic>
<AssemblyName>Uno.UI.MSAL</AssemblyName>
</PropertyGroup>
<PropertyGroup>
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
<Authors>nventive</Authors>
<PackageProjectUrl>https://github.com/unoplatform/uno</PackageProjectUrl>
<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
<PackageIcon>uno.png</PackageIcon>
<RepositoryUrl>https://github.com/unoplatform/uno</RepositoryUrl>
<Description>This package provides the extensions to MSAL (Microsoft.Identity.Client) for an Uno Platform application.</Description>
<Copyright>Copyright (C) 2015-2020 nventive inc. - all rights reserved</Copyright>
<PackageId>Uno.UI.MSAL</PackageId>
<PackageId Condition="'$(UNO_UWP_BUILD)'!='true'">Uno.WinUI.MSAL</PackageId>
</PropertyGroup>
<ItemGroup>
<None Remove="buildTransitive\Uno.UI.MSAL.targets" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\Common\uno.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<Content Include="buildTransitive/*">
<Pack>true</Pack>
<PackagePath>buildTransitive</PackagePath>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.15.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Uno.UI\Uno.UI.net6.csproj" />
</ItemGroup>
<Import Project="..\..\Common.targets" />
<Import Project="..\..\Uno.CrossTargetting.props" />
<Import Project="..\..\..\build\uno.winui.cross-runtime.targets"/>
<Target Name="_UnoToolkitOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
<PropertyGroup>
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
<_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE)</_baseNugetPath>
<_baseNugetPath Condition="'$(HOME)'!=''">$(HOME)</_baseNugetPath>
<_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\Uno.UI.MSAL\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
</PropertyGroup>
<ItemGroup>
<_OutputFiles Include="$(TargetDir)**" />
</ItemGroup>
<MakeDir Directories="$(_TargetNugetFolder)" />
<Message Importance="high" Text="OVERRIDING NUGET PACKAGE CACHE: $(_TargetNugetFolder)" />
<Copy SourceFiles="@(_OutputFiles)" DestinationFiles="@(_OutputFiles->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(_OutputFilesPDB)" DestinationFiles="@(_OutputFilesPDB->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename).pdb')" />
</Target>
<!-- Workaround for missing target running on .NET 5 -->
<Target Name="GetTargetPath" />
</Project>

21
src/Directory.Build.props
Просмотреть файл

@ -6,6 +6,7 @@
<PropertyGroup>
<NoWarn>$(NoWarn);1998</NoWarn>
<NoWarn>$(NoWarn);CA1416</NoWarn> <!-- Disable warning about cross platform call sites -->
<DebugType>portable</DebugType>
<DebugSymbols>True</DebugSymbols>
<RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>
@ -38,6 +39,13 @@
<UNO_UWP_BUILD>true</UNO_UWP_BUILD>
<DefineConstants Condition="'$(UNO_UWP_BUILD)'!='true'">$(DefineConstants);HAS_UNO_WINUI</DefineConstants>
<!-- temporary for net6 telemetry initialization issue -->
<UnoPlatformTelemetryOptOut>true</UnoPlatformTelemetryOptOut>
<!--<UnoSourceGeneratorUnsecureBinLogEnabled>true</UnoSourceGeneratorUnsecureBinLogEnabled>-->
<!--<BuildingInsideUnoSourceGenerator>true</BuildingInsideUnoSourceGenerator>-->
<!--<UnoSourceGeneratorCaptureGenerationHostOutput>true</UnoSourceGeneratorCaptureGenerationHostOutput>-->
</PropertyGroup>
<PropertyGroup>
@ -59,27 +67,38 @@
<!--
Adjust the output paths for runtime project in order for those
projects to stay in the same folder as the original reference one.
projects to stay in the same folder as the original referenced one.
-->
<PropertyGroup>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Foundation.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RuntimeTests.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RuntimeTests.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RuntimeTests.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.MSAL.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Lottie.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.RemoteControl.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Xaml.net6.csproj</_AdjustedOutputProjects>
</PropertyGroup>
<PropertyGroup Condition="$(_AdjustedOutputProjects.Contains('$(MSBuildProjectFile)'))">

11
src/Directory.Build.targets
Просмотреть файл

@ -61,7 +61,16 @@
<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.1.0" />
<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.2.0.2" />
<PackageReference Update="Xamarin.AndroidX.Fragment" Version="1.1.0" />
</ItemGroup>
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-android'">
<PackageReference Update="Xamarin.AndroidX.Legacy.Support.v4" Version="1.0.0.7-net6preview02.4535000" />
<PackageReference Update="Xamarin.AndroidX.AppCompat" Version="1.2.0.7-net6preview02.4535000" />
<PackageReference Update="Xamarin.AndroidX.RecyclerView" Version="1.1.0.8-net6preview02.4535000" />
<PackageReference Update="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.3.0.1-net6preview02.4535000" />
<PackageReference Update="Xamarin.AndroidX.Fragment" Version="1.3.0.1-net6preview02.4535000" />
<!-- <PackageReference Include="xamarin.androidx.vectordrawable" Version="1.1.0" excludeAssets="buildTransitive" />-->
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Update="Xamarin.AndroidX.Legacy.Support.v4" Version="1.0.0" />

11
src/PlatformItemGroups.props
Просмотреть файл

@ -2,12 +2,15 @@
<PropertyGroup>
<_IsAndroid>false</_IsAndroid>
<_IsAndroid Condition="$(IsMonoAndroid)">true</_IsAndroid>
<_IsAndroid Condition="$(IsMonoAndroid) or '$(TargetFramework)'=='net6.0-android'">true</_IsAndroid>
<_IsIOS>false</_IsIOS>
<_IsIOS Condition="$(IsXamarinIOS)">true</_IsIOS>
<_IsCatalyst>false</_IsCatalyst>
<_IsCatalyst Condition="$(_IsCatalyst) or '$(TargetFramework)'=='net6.0-maccatalyst'">true</_IsCatalyst>
<_IsMacOS>false</_IsMacOS>
<_IsIOS>false</_IsIOS>
<_IsIOS Condition="$(IsXamarinIOS) or '$(TargetFramework)'=='net6.0-ios' or '$(TargetFramework)'=='net6.0-maccatalyst'">true</_IsIOS>
<_IsMacOS>false</_IsMacOS>
<_IsMacOS Condition="'$(TargetFramework)'=='xamarinmac20'">true</_IsMacOS>
<_IsNet>false</_IsNet>

2
src/SamplesApp/SamplesApp.Shared/App.xaml.cs
Просмотреть файл

@ -99,7 +99,7 @@ namespace SamplesApp
#endif
override void OnLaunched(LaunchActivatedEventArgs e)
{
#if __IOS__
#if __IOS__ && !NET6_0
// requires Xamarin Test Cloud Agent
Xamarin.Calabash.Start();

14
src/SamplesApp/SamplesApp.Wasm/Properties/launchSettings.json
Просмотреть файл

@ -3,28 +3,28 @@
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:55838/",
"sslPort": 0
"applicationUrl": "http://localhost:54560/",
"sslPort": 44326
}
},
"profiles": {
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
},
"SampleApp.Wasm": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:55838/",
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "http://0.0.0.0:55838/"
"applicationUrl": "http://0.0.0.0:55838/",
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}"
}
}
}
}

19
src/SamplesApp/SamplesApp.net6mobile/Assets/AboutAssets.txt Normal file
Просмотреть файл

@ -0,0 +1,19 @@
Any raw assets you want to be deployed with your application can be placed in
this directory (and child directories) and given a Build Action of "AndroidAsset".
These files will be deployed with you package and will be accessible using Android's
AssetManager, like this:
public class ReadAsset : Activity
{
protected override void OnCreate (Bundle bundle)
{
base.OnCreate (bundle);
InputStream input = Assets.Open ("my_asset.txt");
}
}
Additionally, some Android functions will automatically load asset files:
Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");

Двоичные данные
src/SamplesApp/SamplesApp.net6mobile/Assets/Fonts/uno-fluentui-assets.ttf Normal file
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
src/SamplesApp/SamplesApp.net6mobile/Assets/Fonts/winjs-symbols.ttf Normal file
Просмотреть файл

Двоичный файл не отображается.

1
src/SamplesApp/SamplesApp.net6mobile/Assets/Lottie/4770-lady-and-dove.json Normal file
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

1
src/SamplesApp/SamplesApp.net6mobile/Assets/Lottie/4930-checkbox-animation.json Normal file
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

1811
src/SamplesApp/SamplesApp.net6mobile/Assets/Lottie/LightBulb.json Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

7390
src/SamplesApp/SamplesApp.net6mobile/Assets/Lottie/lottie-logo.json Normal file
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

1
src/SamplesApp/SamplesApp.net6mobile/Assets/Lottie/uno.json Normal file
Просмотреть файл

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Двоичные данные
src/SamplesApp/SamplesApp.net6mobile/Assets/sound.mp3 Normal file
Просмотреть файл

Двоичный файл не отображается.

10
src/SamplesApp/SamplesApp.net6mobile/Entitlements.plist Normal file
Просмотреть файл

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.companyname.SamplesApp</string>
</array>
</dict>
</plist>

72
src/SamplesApp/SamplesApp.net6mobile/Info.plist Normal file
Просмотреть файл

@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>Uno SamplesApp</string>
<key>CFBundleIdentifier</key>
<string>com.companyname.SamplesApp</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MinimumOSVersion</key>
<string>9.0</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIAppFonts</key>
<array>
<string>Fonts/uno-fluentui-assets.ttf</string>
</array>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
<key>NSExceptionMinimumTLSVersion</key>
<string>TLSv1.2</string>
</dict>
<key>NSMotionUsageDescription</key>
<string>This is a step counter, and we&apos;d like to track motion. </string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>TODO NSLocationWhenInUseUsageDescription</string>
<key>NSLocationUsageDescription</key>
<string>TODO NSLocationUsageDescription</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
<key>CFBundleURLName</key>
<string>Uno Samples Test scheme</string>
<key>CFBundleURLSchemes</key>
<array>
<string>uno-samples-test</string>
</array>
</dict>
</array>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>

48
src/SamplesApp/SamplesApp.net6mobile/Main.Android.cs Normal file
Просмотреть файл

@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Android.App;
using Android.Content;
using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using Windows.UI.Xaml.Media;
#if !NET6_0
using Com.Nostra13.Universalimageloader.Core;
#endif
namespace SamplesApp.Droid
{
[global::Android.App.ApplicationAttribute(
Label = "@string/ApplicationName",
LargeHeap = true,
HardwareAccelerated = true,
Theme = "@style/AppTheme"
)]
public class Application : Windows.UI.Xaml.NativeApplication
{
public Application(IntPtr javaReference, JniHandleOwnership transfer)
: base(() => new App(), javaReference, transfer)
{
ConfigureUniversalImageLoader();
}
private void ConfigureUniversalImageLoader()
{
#if !NET6_0
// Create global configuration and initialize ImageLoader with this config
ImageLoaderConfiguration config = new ImageLoaderConfiguration
.Builder(Context)
.Build();
ImageLoader.Instance.Init(config);
ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync;
#endif
}
}
}

15
src/SamplesApp/SamplesApp.net6mobile/Main.iOS.cs Normal file
Просмотреть файл

@ -0,0 +1,15 @@
using UIKit;
namespace SamplesApp.iOS
{
public class Application
{
// This is the main entry point of the application.
static void Main(string[] args)
{
// if you want to use a different Application Delegate class from "AppDelegate"
// you can specify it here.
UIApplication.Main(args, null, typeof(App));
}
}
}

78
src/SamplesApp/SamplesApp.net6mobile/MainActivity.Android.cs Normal file
Просмотреть файл

@ -0,0 +1,78 @@
using System;
using Android.App;
using Android.Content.PM;
using Android.Views;
using Java.Interop;
using Windows.UI.Core;
using Windows.UI.ViewManagement;
using Microsoft.Identity.Client;
namespace SamplesApp.Droid
{
[Activity(
MainLauncher = true,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode,
WindowSoftInputMode = SoftInput.AdjustPan | SoftInput.StateHidden
)]
[IntentFilter(
new[] {
Android.Content.Intent.ActionView
},
Categories = new[] {
Android.Content.Intent.CategoryDefault,
Android.Content.Intent.CategoryBrowsable
},
DataScheme = "uno-samples-test")]
public class MainActivity : Windows.UI.Xaml.ApplicationActivity
{
[Export("RunTest")]
public string RunTest(string metadataName) => App.RunTest(metadataName);
[Export("IsTestDone")]
public bool IsTestDone(string testId) => App.IsTestDone(testId);
[Export("GetDisplayScreenScaling")]
public string GetDisplayScreenScaling(string displayId) => App.GetDisplayScreenScaling(displayId);
[Export("SetFullScreenMode")]
public void SetFullScreenMode(bool fullscreen)
{
// workaround for #2747: force the app into fullscreen
// to prevent status bar from reappearing when popup are shown.
var activity = Uno.UI.ContextHelper.Current as Activity;
if (fullscreen)
{
activity.Window.AddFlags(WindowManagerFlags.Fullscreen);
}
else
{
activity.Window.ClearFlags(WindowManagerFlags.Fullscreen);
}
}
protected override void OnActivityResult(int requestCode, Result resultCode, Android.Content.Intent data)
{
base.OnActivityResult(requestCode, resultCode, data);
#if !NET6_0
AuthenticationContinuationHelper.SetAuthenticationContinuationEventArgs(requestCode, resultCode, data);
#endif
}
}
#if !NET6_0
[Activity]
[IntentFilter(
new[] {
Android.Content.Intent.ActionView
},
Categories = new[] {
Android.Content.Intent.CategoryDefault,
Android.Content.Intent.CategoryBrowsable
},
DataScheme = "msauth")]
public class MsalActivity : BrowserTabActivity
{
}
#endif
}

12
src/SamplesApp/SamplesApp.net6mobile/Properties/AssemblyInfo.Android.cs Normal file
Просмотреть файл

@ -0,0 +1,12 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Android.App;
[assembly: UsesPermission("android.permission.ACCESS_COARSE_LOCATION")]
[assembly: UsesPermission("android.permission.ACCESS_FINE_LOCATION")]
[assembly: UsesPermission("android.permission.VIBRATE")]
[assembly: UsesPermission("android.permission.ACTIVITY_RECOGNITION")]
[assembly: UsesPermission("android.permission.ACCESS_NETWORK_STATE")]
[assembly: UsesPermission("android.permission.SET_WALLPAPER")]
[assembly: UsesPermission("android.permission.READ_CONTACTS")]

9
src/SamplesApp/SamplesApp.net6mobile/Properties/MyAndroidManifest.xml Normal file
Просмотреть файл

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="uno.platform.unosampleapp" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="30" />
<!-- NOTE: Add permissions in AssemblyInfo.cs -->
<application android:label="SamplesApp" android:usesCleartextTraffic="true">
<!-- Set an API key locally to test the MapControl - https://developers.google.com/maps/documentation/android-sdk/get-api-key -->
<meta-data android:name="com.google.android.geo.API_KEY" android:value="YOUR API KEY" />
</application>
</manifest>

44
src/SamplesApp/SamplesApp.net6mobile/Resources/AboutResources.txt Normal file
Просмотреть файл

@ -0,0 +1,44 @@
Images, layout descriptions, binary blobs and string dictionaries can be included
in your application as resource files. Various Android APIs are designed to
operate on the resource IDs instead of dealing with images, strings or binary blobs
directly.
For example, a sample Android app that contains a user interface layout (main.axml),
an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png)
would keep its resources in the "Resources" directory of the application:
Resources/
drawable/
icon.png
layout/
main.axml
values/
strings.xml
In order to get the build system to recognize Android resources, set the build action to
"AndroidResource". The native Android APIs do not operate directly with filenames, but
instead operate on resource IDs. When you compile an Android application that uses resources,
the build system will package the resources for distribution and generate a class called "R"
(this is an Android convention) that contains the tokens for each one of the resources
included. For example, for the above Resources layout, this is what the R class would expose:
public class R {
public class drawable {
public const int icon = 0x123;
}
public class layout {
public const int main = 0x456;
}
public class strings {
public const int first_string = 0xabc;
public const int second_string = 0xbcd;
}
}
You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main
to reference the layout/main.axml file, or R.strings.first_string to reference the first
string in the dictionary file values/strings.xml.

Двоичные данные
src/SamplesApp/SamplesApp.net6mobile/Resources/drawable/Icon.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 4.0 KiB

5
src/SamplesApp/SamplesApp.net6mobile/Resources/values/Strings.xml Normal file
Просмотреть файл

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="Hello">Hello World, Click Me!</string>
<string name="ApplicationName">SamplesApp</string>
</resources>

12
src/SamplesApp/SamplesApp.net6mobile/Resources/values/Styles.xml Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<resources>
<style name="AppTheme" parent="Theme.AppCompat.Light">
<!-- This removes the ActionBar -->
<item name="windowActionBar">false</item>
<item name="android:windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowNoTitle">true</item>
</style>
</resources>

104
src/SamplesApp/SamplesApp.net6mobile/SamplesApp.net6mobile.csproj Normal file
Просмотреть файл

@ -0,0 +1,104 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<OutputType>Exe</OutputType>
<AssemblyName>SamplesApp</AssemblyName>
<DefineConstants>$(DefineConstants);XAMARIN;HAS_UNO</DefineConstants>
<IsUnoHead>true</IsUnoHead>
<!-- Error: Optimizing assemblies for size is not supported for the selected publish configuration -->
<PublishTrimmed>false</PublishTrimmed>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<IsUiAutomationMappingEnabled>true</IsUiAutomationMappingEnabled>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-android'">
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<AndroidManifest>Properties\MyAndroidManifest.xml</AndroidManifest>
<ResourcesDirectory>..\SamplesApp.Shared\Strings</ResourcesDirectory>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
<RuntimeIdentifier>ios-x64</RuntimeIdentifier>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
<DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0-android'">
<!--<PackageReference Include="Xamarin.Google.Android.Material" Version="1.3.0.1-net6preview01" />-->
<!--TODO: Xamarin.AndroidX.Arch.Core.Runtime should be transitive dependency and not needed-->
<PackageReference Include="Xamarin.AndroidX.Arch.Core.Runtime" Version="2.1.0.8-net6preview02.4535000" />
<!--<AndroidResource Include="Resources\values\Styles.xml" />
<AndroidResource Include="Resources\drawable\Icon.png" />
<AndroidAsset Include="Assets\sound.mp3" />
<AndroidAsset Include="Assets\Fonts\uno-fluentui-assets.ttf" />
<AndroidAsset Include="Assets\Lottie\4770-lady-and-dove.json" />
<AndroidAsset Include="Assets\Lottie\4930-checkbox-animation.json" />
<AndroidAsset Include="Assets\Lottie\lottie-logo.json" />
<AndroidAsset Include="Assets\Lottie\uno.json" />
<AndroidAsset Include="Assets\Lottie\LightBulb.json" />-->
<AndroidEnvironment Include="environment.conf" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Graph">
<Version>3.12.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Identity.Client">
<Version>4.15.0</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>12.0.3</Version>
</PackageReference>
<PackageReference Include="Uno.CodeGen">
<Version>1.32.0</Version>
</PackageReference>
<!--<PackageReference Include="Uno.UniversalImageLoader"
Version="1.9.33" />-->
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="Uno.SourceGenerationTasks" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0-android'">
<ProjectReference Include="..\..\Uno.UI.BindingHelper.Android\Uno.UI.BindingHelper.Android.net6.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Uno.Foundation\Uno.Foundation.net6.csproj" />
<ProjectReference Include="..\..\Uno.UI\Uno.UI.net6.csproj" />
<ProjectReference Include="..\..\Uno.UWP\Uno.net6.csproj" />
<ProjectReference Include="..\..\Uno.UI.Toolkit\Uno.UI.Toolkit.net6.csproj" />
<ProjectReference Include="..\..\AddIns\Uno.UI.Lottie\Uno.UI.Lottie.net6.csproj" />
<ProjectReference Include="..\..\Uno.UI.RuntimeTests\Uno.UI.RuntimeTests.net6.csproj" />
<ProjectReference Include="..\..\Uno.UI.FluentTheme\Uno.UI.FluentTheme.net6.csproj" />
<ProjectReference Include="..\..\AddIns\Uno.UI.MSAL\Uno.UI.MSAL.net6.csproj" />
<!--
<ProjectReference Include="..\..\Uno.UI.DualScreen\Uno.UI.DualScreen.net6.csproj"/>
<ProjectReference Include="..\..\Uno.UI.Maps\Uno.UI.Maps.net6.csproj"/>
<ProjectReference Include="..\..\Uno.UI.RemoteControl\Uno.UI.RemoteControl.net6.csproj"/>
-->
</ItemGroup>
<Import Project="..\..\SourceGenerators\sourcegenerators.local.props" />
<Import Project="..\SamplesApp.Shared\SamplesApp.Shared.projitems" Label="Shared" Condition="Exists('..\SamplesApp.Shared\SamplesApp.Shared.projitems')" />
<Import Project="..\SamplesApp.UnitTests.Shared\SamplesApp.UnitTests.Shared.projitems" Label="Shared" />
<Import Project="..\UITests.Shared\UITests.Shared.projitems" Label="Shared" />
<Import Project="..\..\Uno.CrossTargetting.props" />
</Project>

2
src/SamplesApp/SamplesApp.net6mobile/environment.conf Normal file
Просмотреть файл

@ -0,0 +1,2 @@
# See this for more details: http://developer.xamarin.com/guides/android/advanced_topics/garbage_collection/
MONO_GC_PARAMS=bridge-implementation=tarjan,nursery-size=32m,soft-heap-limit=256m

2
src/SamplesApp/UITests.Shared/Msal/MsalLoginAndGraph.xaml.cs
Просмотреть файл

@ -44,7 +44,7 @@ namespace UITests.Msal
.WithTenantId(TENANT_ID)
.WithRedirectUri(REDIRECT_URI)
.WithUnoHelpers()
#if __IOS__
#if __IOS__ && !NET6_0
.WithIosKeychainSecurityGroup("com.companyname.SamplesApp")
#endif
.Build();

11
src/SamplesApp/UITests.Shared/Windows_Security_Authentication_Web/AuthenticationBroker_Demo.xaml.cs
Просмотреть файл

@ -2,14 +2,18 @@
using Windows.Security.Authentication.Web;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using IdentityModel.OidcClient;
using Uno.UI.Samples.Controls;
#if !NET6_0_OR_GREATER
using IdentityModel.OidcClient;
#endif
namespace SamplesApp.UITests.Windows_Security_Authentication_Web
{
[Sample("Authentication", IsManualTest = true)]
public sealed partial class AuthenticationBroker_Demo : Page
{
#if !NET6_0_OR_GREATER
public AuthenticationBroker_Demo()
{
this.InitializeComponent();
@ -66,9 +70,11 @@ namespace SamplesApp.UITests.Windows_Security_Authentication_Web
}
}
#endif
private async void SignIn_Clicked(object sender, RoutedEventArgs e)
{
#if !NET6_0_OR_GREATER
var startUri = new Uri(_loginState.StartUrl);
// Important: there should be NO await before calling .AuthenticateAsync() - at least
@ -100,12 +106,15 @@ namespace SamplesApp.UITests.Windows_Security_Authentication_Web
// TODO: make something useful with the tokens
resultTxt.Text = $"Success - Token is {token}";
#endif
}
private async void SignOut_Clicked(object sender, RoutedEventArgs e)
{
#if !NET6_0_OR_GREATER
var userResult = await WebAuthenticationBroker.AuthenticateAsync(WebAuthenticationOptions.None, _logoutUrl);
resultTxt.Text = $"{userResult.ResponseStatus}";
#endif
}
}
}

2
src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBox/TextBox_Selection.xaml.cs
Просмотреть файл

@ -15,7 +15,7 @@ namespace Uno.UI.Samples.Content.UITests.TextBoxControl
{
this.InitializeComponent();
#if XAMARIN_IOS || XAMARIN_ANDROID
#if false // XAMARIN_IOS || XAMARIN_ANDROID
var textBox = new TextBox() { PlaceholderText = "Selection", AcceptsReturn = true };
var startTextBox = new TextBox() { PlaceholderText = "Start" };
var lengthTextBox = new TextBox() { PlaceholderText = "Length" };

46
src/SourceGenerators/System.Xaml/Uno.Xaml.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,46 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
<DisableBuildTargetFramework>true</DisableBuildTargetFramework>
<AssemblyName>Uno.Xaml</AssemblyName>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<AndroidResgenFile>obj\$(TargetFramework)\Resources\Resource.Designer.cs</AndroidResgenFile>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<OutputPath>bin\$(Configuration)\$(TargetFramework)\</OutputPath>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\$(TargetFramework)\</IntermediateOutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<Import Project="../../netcore-build.props"/>
<PropertyGroup>
<DefineConstants>$(DefineConstants);NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>full</DebugType>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Test\**\*.cs" />
<None Remove="Test\**\*.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<Reference Remove="System.Xaml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.MonoAnalyzers" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
</ItemGroup>
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
</Project>

2
src/SourceGenerators/Uno.UI.SourceGenerators/Content/Uno.UI.SourceGenerators.props
Просмотреть файл

@ -380,7 +380,7 @@
<Target Name="_UnoUIValidateLongPathSupport"
BeforeTargets="CoreCompile"
Condition="$([MSBuild]::IsOsPlatform(Windows)) and ( ('$(UnoUIUseRoslynSourceGenerators)'=='true' and '$(EmitCompilerGeneratedFiles)'=='true') or '$(MSBuildThisFileDirectory.Length)' &gt; 64)">
Condition="'$(MSBuildRuntimeType)'!='Core' and $([MSBuild]::IsOsPlatform(Windows)) and ( ('$(UnoUIUseRoslynSourceGenerators)'=='true' and '$(EmitCompilerGeneratedFiles)'=='true') or '$(MSBuildThisFileDirectory.Length)' &gt; 64)">
<!---
Validation for LongPath support (source https://github.com/dotnet/roslyn/blob/c8eecdb9563127988b3cb564a493eae9ef254a88/eng/build.ps1#L607)
https://docs.microsoft.com/en-us/archive/blogs/jeremykuhne/net-4-6-2-and-long-paths-on-windows-10#enabling-win32-long-path-support

2
src/SourceGenerators/Uno.UI.Tasks/Content/Uno.UI.Tasks.targets
Просмотреть файл

@ -23,7 +23,7 @@
DependsOnTargets="ResolveProjectReferences"
Condition="'$(DesignTimeBuild)' != 'true' and '$(BuildingInsideUnoSourceGenerator)' == ''">
<CheckForDevenv Condition="'$(SolutionFileName)'=='Uno.UI.sln'" />
<CheckForDevenv Condition="'$(SolutionFileName)'=='Uno.UI.sln' and '$(MSBuildRuntimeType)'!='Core'" />
<!-- String resources -->
<PropertyGroup>

48
src/Uno.Foundation/Uno.Foundation.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,48 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Uno.Foundation</AssemblyName>
<RootNamespace>Windows.Foundation</RootNamespace>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<UnoRuntimeIdentifier Condition="'$(TargetFramework)'=='netstandard2.0'">Reference</UnoRuntimeIdentifier>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" />
<PackageReference Include="Uno.Core" />
<PackageReference Include="Uno.MonoAnalyzers" />
<PackageReference Include="Uno.Diagnostics.Eventing" />
</ItemGroup>
<ItemGroup Condition="$(_IsNetStd) or $(_IsNet)">
<PackageReference Include="System.Memory" />
</ItemGroup>
<ItemGroup>
<UpToDateCheckInput Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs;" Visible="False" />
</ItemGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<ItemGroup>
<UpToDateCheckInput Remove="Extensions\RectExtensions.cs" />
</ItemGroup>
</Project>

30
src/Uno.UI-net6-only.slnf Normal file
Просмотреть файл

@ -0,0 +1,30 @@
{
"solution": {
"path": "Uno.UI.sln",
"projects": [
"AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.net6.csproj",
"AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.net6.csproj",
"SamplesApp\\SamplesApp.Shared\\SamplesApp.Shared.shproj",
"SamplesApp\\SamplesApp.UITests.Generator\\Uno.Samples.UITest.Generator.csproj",
"SamplesApp\\SamplesApp.UITests\\SamplesApp.UITests.csproj",
"SamplesApp\\SamplesApp.UnitTests.Shared\\SamplesApp.UnitTests.Shared.shproj",
"SamplesApp\\SamplesApp.net6mobile\\SamplesApp.net6mobile.csproj",
"SamplesApp\\UITests.Shared\\UITests.Shared.shproj",
"SourceGenerators\\System.Xaml\\Uno.Xaml.net6.csproj",
"SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj",
"SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj",
"T4Generator\\T4Generator.csproj",
"Uno.Foundation\\Uno.Foundation.net6.csproj",
"Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.net6.csproj",
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.net6.csproj",
"Uno.UI.RemoteControl.Host\\Uno.UI.RemoteControl.Host.csproj",
"Uno.UI.RemoteControl.VS\\Uno.UI.RemoteControl.VS.csproj",
"Uno.UI.RemoteControl\\Uno.UI.RemoteControl.net6.csproj",
"Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.net6.csproj",
"Uno.UI.Toolkit\\Uno.UI.Toolkit.net6.csproj",
"Uno.UI\\Uno.UI.net6.csproj",
"Uno.UWP\\Uno.net6.csproj",
"Uno.WinUIRevert\\Uno.WinUIRevert.csproj"
]
}
}

77
src/Uno.UI-packages-no-net6.slnf Normal file
Просмотреть файл

@ -0,0 +1,77 @@
{
"solution": {
"path": "Uno.UI.sln",
"projects": [
"..\\build\\Uno.UI.Build.csproj",
"AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Skia.csproj",
"AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.Wasm.csproj",
"AddIns\\Uno.UI.Lottie\\Uno.UI.Lottie.csproj",
"AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Skia.csproj",
"AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.Wasm.csproj",
"AddIns\\Uno.UI.MSAL\\Uno.UI.MSAL.csproj",
"ResourceConverter\\ResourceConverter.csproj",
"SolutionTemplate\\Uno.ProjectTemplates.Dotnet\\Uno.ProjectTemplates.Dotnet.csproj",
"SolutionTemplate\\UnoLibraryTemplate\\UnoLibraryTemplate.csproj",
"SolutionTemplate\\UnoSolutionTemplate.VISX\\UnoSolutionTemplate.VISX.csproj",
"SolutionTemplate\\UnoSolutionTemplate.Wizard\\UnoSolutionTemplate.Wizard.csproj",
"SolutionTemplate\\UnoSolutionTemplate\\UnoSolutionTemplate.csproj",
"SourceGenerators\\System.Xaml.Tests.MS\\System.Xaml.Tests.MS.csproj",
"SourceGenerators\\System.Xaml.Tests\\Uno.Xaml.Tests.csproj",
"SourceGenerators\\System.Xaml\\Uno.Xaml.csproj",
"SourceGenerators\\Uno.UI.SourceGenerators.Tests\\Uno.UI.SourceGenerators.Tests.csproj",
"SourceGenerators\\Uno.UI.SourceGenerators\\Uno.UI.SourceGenerators.csproj",
"SourceGenerators\\Uno.UI.Tasks\\Uno.UI.Tasks.csproj",
"SourceGenerators\\XamlGenerationTests.Core\\XamlGenerationTests.Core.csproj",
"SourceGenerators\\XamlGenerationTests\\XamlGenerationTests.csproj",
"T4Generator\\T4Generator.csproj",
"UWPUsageStatsGenerator\\UWPUsageStatsGenerator.csproj",
"Uno.Analyzers.Tests\\Uno.Analyzers.Tests.csproj",
"Uno.Analyzers\\Uno.Analyzers.csproj",
"Uno.Foundation.Runtime.WebAssembly\\Uno.Foundation.Runtime.WebAssembly.csproj",
"Uno.Foundation\\Uno.Foundation.Skia.csproj",
"Uno.Foundation\\Uno.Foundation.Wasm.csproj",
"Uno.Foundation\\Uno.Foundation.csproj",
"Uno.NUnitTransformTool\\Uno.NUnitTransformTool.csproj",
"Uno.ReferenceImplComparer\\Uno.ReferenceImplComparer.csproj",
"Uno.UI.AssemblyComparer\\Uno.UI.AssemblyComparer.csproj",
"Uno.UI.BindingHelper.Android\\Uno.UI.BindingHelper.Android.csproj",
"Uno.UI.DualScreen\\Uno.UI.DualScreen.csproj",
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Skia.csproj",
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.Wasm.csproj",
"Uno.UI.FluentTheme\\Uno.UI.FluentTheme.csproj",
"Uno.UI.Maps\\Uno.UI.Maps.csproj",
"Uno.UI.RemoteControl.Host\\Uno.UI.RemoteControl.Host.csproj",
"Uno.UI.RemoteControl.VS\\Uno.UI.RemoteControl.VS.csproj",
"Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Skia.csproj",
"Uno.UI.RemoteControl\\Uno.UI.RemoteControl.Wasm.csproj",
"Uno.UI.RemoteControl\\Uno.UI.RemoteControl.csproj",
"Uno.UI.Runtime.Skia.Gtk\\Uno.UI.Runtime.Skia.Gtk.csproj",
"Uno.UI.Runtime.Skia.Tizen\\Uno.UI.Runtime.Skia.Tizen.csproj",
"Uno.UI.Runtime.Skia.Wpf\\Uno.UI.Runtime.Skia.Wpf.csproj",
"Uno.UI.Runtime.WebAssembly.Compatibility\\Uno.UI.Runtime.WebAssembly.Compatibility.csproj",
"Uno.UI.Runtime.WebAssembly\\Uno.UI.Runtime.WebAssembly.csproj",
"Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.Skia.csproj",
"Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.Wasm.csproj",
"Uno.UI.RuntimeTests\\Uno.UI.RuntimeTests.csproj",
"Uno.UI.TestComparer\\Uno.UI.TestComparer.csproj",
"Uno.UI.Tests.Performance\\Uno.UI.Tests.Performance.csproj",
"Uno.UI.Tests.ViewLibraryProps\\Uno.UI.Tests.ViewLibraryProps.csproj",
"Uno.UI.Tests.ViewLibrary\\Uno.UI.Tests.ViewLibrary.csproj",
"Uno.UI.Tests\\Uno.UI.Tests.csproj",
"Uno.UI.Toolkit\\Uno.UI.Toolkit.Skia.csproj",
"Uno.UI.Toolkit\\Uno.UI.Toolkit.Wasm.csproj",
"Uno.UI.Toolkit\\Uno.UI.Toolkit.csproj",
"Uno.UI.Wasm.Tests\\Uno.UI.Wasm.Tests.csproj",
"Uno.UI\\Uno.UI.Skia.csproj",
"Uno.UI\\Uno.UI.Wasm.csproj",
"Uno.UI\\Uno.UI.csproj",
"Uno.UWPSyncGenerator.Reference\\Uno.UWPSyncGenerator.Reference.csproj",
"Uno.UWPSyncGenerator\\Uno.UWPSyncGenerator.csproj",
"Uno.UWP\\Uno.Skia.csproj",
"Uno.UWP\\Uno.Wasm.csproj",
"Uno.UWP\\Uno.csproj",
"Uno.WinUIRevert\\Uno.WinUIRevert.csproj",
"UnoItemTemplate\\UnoItemTemplate.csproj"
]
}
}

147
src/Uno.UI.BindingHelper.Android/Uno.UI.BindingHelper.Android.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,147 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>1701;1702;1705;109</NoWarn>
<AssemblyName>Uno.UI.BindingHelper.Android</AssemblyName>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<AndroidResgenFile>obj\$(TargetFramework)\Resources\Resource.Designer.cs</AndroidResgenFile>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<IsBindingProject Condition="'$(TargetFramework)' == 'net6.0-android'">true</IsBindingProject>
<_isWindows>$([MSBuild]::IsOsPlatform(Windows))</_isWindows>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<!--Workaround because this variable is missing by default. See https://github.com/xamarin/xamarin-android/issues/2452 -->
<PropertyGroup>
<AndroidSdkBuildToolsVersion Condition="'$(AndroidSdkBuildToolsVersion)' == ''">28.0.3</AndroidSdkBuildToolsVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Build.Download" Version="0.4.11" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0-android'">
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" />
</ItemGroup>
<ItemGroup>
<_JavaFile Include="Uno\**\*.java" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\Metadata.xml">
<SubType>Designer</SubType>
</TransformFile>
<TransformFile Include="Transforms\EnumFields.xml" />
<TransformFile Include="Transforms\EnumMethods.xml" />
</ItemGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<Target Name="_CompileUnoJavaCreateOutputs" BeforeTargets="Build" AfterTargets="Restore">
<!--
Create the EmbeddedJar itemgroup here so the Xamarin tooling picks it up,
but in the obj folder so we don't have rebuild and git ignore issues.
-->
<ItemGroup>
<EmbeddedJar Include="$(IntermediateOutputPath)unojars\uno.ui-$(TargetFramework).jar" />
</ItemGroup>
</Target>
<Target Name="_CleanJavaGenerated" BeforeTargets="Clean">
<Message Text="Removing java generated" />
<ItemGroup>
<_JavaFilesToDelete Include="$(IntermediateOutputPath)\unojars\**\*.jar" />
<_JavaFilesToDelete Include="$(IntermediateOutputPath)\unoclasses\**\*.class" />
</ItemGroup>
<Delete Files="@(_JavaFilesToDelete)" />
</Target>
<!-- Workaround for https://github.com/unoplatform/uno/issues/986 -->
<Target Name="Issue986Workaround" BeforeTargets="ExportJarToXml" Condition="'$(MSBuildVersion)' &lt; '16.8'">
<!--
This is required to ensure the first pass of the BindingsGenerator task is
executed properly (inside of ExportJarToXml). If not, the second pass in the
GenerateBindings target is not given proper api mappings, ending in the generation
of an empty assembly.
-->
<Delete Files="$(IntermediateOutputPath)\api.xml" />
</Target>
<ItemGroup>
<_CompileUnoJavaBeforeTargets Include="ExportJarToXml" />
<_CompileUnoJavaBeforeTargets Include="GenerateBindings" />
<_CompileUnoJavaBeforeTargets Include="_GetLibraryImports" />
<_CompileUnoJavaBeforeTargets Include="ExportJarToXml" />
<_CompileUnoJavaAfterTargets Include="_ExtractLibraryProjectImports" /> <!-- This target generates the \lp\**\classes.jar -->
</ItemGroup>
<Target Name="_CompileUnoJava" Condition="'$(DesignTimeBuild)' != 'true'" BeforeTargets="@(_CompileUnoJavaBeforeTargets)" AfterTargets="@(_CompileUnoJavaAfterTargets)" Inputs="@(_JavaFile)" Outputs="@(EmbeddedJar)" DependsOnTargets="_CompileUnoJavaCreateOutputs;@(XamarinBuildRestoreResources)">
<ItemGroup>
<_AndroidJar Include="%ProgramFiles(x86)%\Reference Assemblies\Microsoft\Framework\MonoAndroid\$(TargetFrameworkVersion)\mono.android.jar" />
<_AndroidJar Include="$(IntermediateOutputPath)\__library_projects__\Xamarin.Android.Support.Annotations\library_project_imports\support-annotations.jar" />
<_AndroidJar Include="$(IntermediateOutputPath)\__library_projects__\**\classes.jar" />
<_AndroidJar Include="$(IntermediateOutputPath)\lp\**\classes.jar" />
</ItemGroup>
<PropertyGroup>
<_JavaVersion>1.8</_JavaVersion>
<_JavaVersion Condition="'$(MSBuildVersion)' &lt; '15.4'">1.7</_JavaVersion>
<_JavaCBinPath>javac</_JavaCBinPath>
<_JavaCBinPath Condition="Exists('$(_JavaSdkDirectory)bin\javac.exe')">$(_JavaSdkDirectory)bin\javac.exe</_JavaCBinPath>
<_JarBinPath>$(_JavaSdkDirectory)bin\jar</_JarBinPath>
<_JarBinPath Condition="Exists('$(_JavaSdkDirectory)bin\jar.exe')">$(_JavaSdkDirectory)bin\jar.exe</_JarBinPath>
<_flattenAndroidJar Condition="!$(_isWindows)">@(_AndroidJar, ':')</_flattenAndroidJar>
<_flattenAndroidJar Condition="$(_isWindows)">@(_AndroidJar)</_flattenAndroidJar>
<_CompileCommand>"$(_JavaCBinPath)" -g -source $(_javaVersion) -d .\$(IntermediateOutputPath)\unoclasses -target $(_javaVersion) -J-Dfile.encoding=UTF8 -classpath "$(_flattenAndroidJar)" -bootclasspath "$(_AndroidSdkDirectory)platforms\android-$(_AndroidApiLevel)\android.jar" -encoding UTF-8 .\Uno\UI\*.java</_CompileCommand>
</PropertyGroup>
<Error Text="The Android SDK for API level $(_AndroidApiLevel) is not installed. Install it through the Android SDK manager." Condition="!Exists('$(_AndroidSdkDirectory)platforms\android-$(_AndroidApiLevel)\android.jar')" />
<Message Text="Compiling java ($(_CurrentSupportV4) for $(TargetFramework)): $(_CompileCommand)" Importance="high" />
<MakeDir Directories="$(IntermediateOutputPath)\unoclasses" />
<Exec Command="$(_CompileCommand)" />
<MakeDir Directories="$(IntermediateOutputPath)\unojars" />
<Exec Command="&quot;$(_JarBinPath)&quot; cvf @(EmbeddedJar) -C $(IntermediateOutputPath)unoclasses ." />
</Target>
<Target Name="_WorkaroundRegisterMdbFilesWithFileWrites" BeforeTargets="IncrementalClean">
<CreateItem Include="$(OutDir)*.mdb;$(MonoAndroidIntermediateAssemblyDir)*.mdb">
<Output TaskParameter="Include" ItemName="_FilesToRegister" />
</CreateItem>
<CreateItem Include="$([System.IO.Path]::GetFullPath('%(_FilesToRegister.Identity)'))" Condition="Exists('%(_FilesToRegister.Identity)')">
<Output TaskParameter="Include" ItemName="_CleanCurrentFileWrites" />
</CreateItem>
</Target>
<!-- This is to be removed when VS15.3 will be released. This is caused by conditional ProjectReference from Uno.UI -->
<ItemGroup Condition="$(IsMonoAndroid)">
<Compile Remove="**\*.cs" />
</ItemGroup>
<Target Name="GetBuiltProjectOutputRecursive" Condition="!$(IsMonoAndroid)" />
</Project>

38
src/Uno.UI.FluentTheme/Uno.UI.FluentTheme.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>Uno.UI.FluentTheme</AssemblyName>
<RootNamespace>Uno.UI.FluentTheme</RootNamespace>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<UseCommonOverridePackage>true</UseCommonOverridePackage>
<CommonOverridePackageId>Uno.UI</CommonOverridePackageId>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.UI\Uno.UI.net6.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" />
</ItemGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<Import Project="FluentMerge.targets" />
</Project>

101
src/Uno.UI.RemoteControl/Uno.UI.RemoteControl.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,101 @@
<Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Uno.UI.RemoteControl</AssemblyName>
<RootNamespace>Uno.UI.RemoteControl</RootNamespace>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<AndroidResgenFile>obj\$(TargetFramework)\Resources\Resource.Designer.cs</AndroidResgenFile>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<PackageId>Uno.UI.RemoteControl</PackageId>
<PackageId Condition="'$(UNO_UWP_BUILD)'=='false'">Uno.WinUI.RemoteControl</PackageId>
</PropertyGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<ItemGroup>
<UpToDateCheckInput Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs;" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='netstandard2.0'">
<EmbeddedResource Include="LinkerDefinition.Xamarin.xml">
<LogicalName>$(AssemblyName).xml</LogicalName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="buildTransitive\Uno.UI.RemoteControl.targets">
<PackagePath>build</PackagePath>
<Pack>true</Pack>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Uno.MonoAnalyzers" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.net6.csproj" />
<ProjectReference Include="..\Uno.UWP\Uno.net6.csproj" />
<ProjectReference Include="..\Uno.UI\Uno.UI.net6.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(DocsGeneration)'==''">
<ProjectReference Include="..\Uno.UI.RemoteControl.Host\Uno.UI.RemoteControl.Host.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<UndefineProperties>TargetFramework</UndefineProperties>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(DocsGeneration)'=='' and $([MSBuild]::IsOsPlatform('Windows'))">
<ProjectReference Include="..\Uno.UI.RemoteControl.VS\Uno.UI.RemoteControl.VS.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<UndefineProperties>TargetFramework</UndefineProperties>
</ProjectReference>
</ItemGroup>
<Target Name="GetBuiltProjectOutputRecursive" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
<Target Name="_UnoRemoteControlOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
<PropertyGroup>
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
<_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE)</_baseNugetPath>
<_baseNugetPath Condition="'$(HOME)'!=''">$(HOME)</_baseNugetPath>
<_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\uno.ui\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
</PropertyGroup>
<ItemGroup>
<_OutputFiles Include="$(TargetDir)\*.*" />
</ItemGroup>
<MakeDir Directories="$(_TargetNugetFolder)" />
<Message Importance="high" Text="OVERRIDING NUGET PACKAGE CACHE: $(_TargetNugetFolder)" />
<Copy SourceFiles="@(_OutputFiles)" DestinationFiles="@(_OutputFiles->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
</Project>

82
src/Uno.UI.RuntimeTests/Uno.UI.RuntimeTests.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
<AssemblyName>Uno.UI.RuntimeTests</AssemblyName>
<RootNamespace>Uno.UI.RuntimeTests</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<!--Workaround to prevent build to fail because the project has too many dependencies when checking support libraries versions.
(Introduced with support libraries 28.0.0.1) -->
<PropertyGroup>
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="Uno.SourceGenerationTasks" />
<ProjectReference Include="..\Uno.UI.Toolkit\Uno.UI.Toolkit.net6.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'!='uap10.0.17763'">
<Compile Include="$(MSBuildThisFileDirectory)..\Uno.UI.Tests\Windows_UI_Xaml\FrameworkElementTests\*.cs">
<Link>UnitTests\Windows_UI_Xaml\FrameworkElementTests\%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)..\Uno.UI.Tests\Windows_UI_XAML_Controls\GridTests\Given_Grid_And_Min_Max.cs">
<Link>UnitTests\Windows_UI_Xaml_Controls\GridTests\%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)..\Uno.UI.Tests\Windows_UI_XAML_Controls\GridTests\Context.cs">
<Link>UnitTests\Windows_UI_Xaml_Controls\GridTests\%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
<Compile Include="$(MSBuildThisFileDirectory)..\Uno.UI.Tests\Windows_UI_XAML_Controls\BorderTests\*.cs">
<Link>UnitTests\Windows_UI_Xaml_Controls\BorderTests\%(RecursiveDir)%(FileName)%(Extension)</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.net6.csproj" />
<ProjectReference Include="..\Uno.UI\Uno.UI.net6.csproj" />
<ProjectReference Include="..\Uno.UWP\Uno.net6.csproj" />
<ProjectReference Include="..\Uno.UI.FluentTheme\Uno.UI.FluentTheme.net6.csproj" />
</ItemGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<ItemGroup>
<!-- Remove already included XAML -->
<Page Remove="@(Page)" />
<Page Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
</ItemGroup>
<ItemGroup>
<PRIResource Include="Resources\**\*.resw" />
</ItemGroup>
<PropertyGroup>
<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
</PropertyGroup>
<ItemGroup Condition="'$(DocsGeneration)'==''">
<ProjectReference Include="..\SourceGenerators\Uno.UI.SourceGenerators\Uno.UI.SourceGenerators.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<UndefineProperties>TargetFramework</UndefineProperties>
</ProjectReference>
</ItemGroup>
<Import Project="..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
<Import Project="..\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" Condition="'$(SkipUnoResourceGeneration)' == '' " />
</Project>

98
src/Uno.UI.Toolkit/Uno.UI.Toolkit.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,98 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Uno.UI.Toolkit</AssemblyName>
<RootNamespace>Uno.UI.Toolkit</RootNamespace>
<Product>$(AssemblyName) ($(TargetFramework))</Product>
<DefaultLanguage>en-US</DefaultLanguage>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<UnoRuntimeIdentifier Condition="'$(TargetFramework)'=='netstandard2.0'">Reference</UnoRuntimeIdentifier>
<UseCommonOverridePackage>true</UseCommonOverridePackage>
<CommonOverridePackageId>Uno.UI</CommonOverridePackageId>
</PropertyGroup>
<!--Workaround to prevent build to fail because the project has too many dependencies when checking support libraries versions.
(Introduced with support libraries 28.0.0.1) -->
<PropertyGroup>
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
</PropertyGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<ItemGroup>
<Compile Include="..\Uno.UI\Behaviors\VisibleBoundsPadding.cs" Link="VisibleBoundsPadding.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" />
<PackageReference Include="Uno.Core" />
<PackageReference Include="Uno.Core.Build" />
</ItemGroup>
<ItemGroup Condition=" $(IsMonoAndroid) or $(IsXamarinIOS) or $(IsXamarinMac) ">
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.UI\Uno.UI.net6.csproj">
<Name>Uno.UI</Name>
</ProjectReference>
<ProjectReference Include="..\Uno.UWP\Uno.net6.csproj">
<Name>Uno</Name>
</ProjectReference>
<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.net6.csproj">
<Name>Uno.Foundation</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0-android'">
<ProjectReference Include="..\Uno.UI.BindingHelper.Android\Uno.UI.BindingHelper.Android.net6.csproj">
<Project>{58332380-4302-4259-8f36-af572c53827f}</Project>
<Name>Uno.UI.BindingHelper.Android</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Remove="Themes\Generic.xaml" />
<Page Include="Themes\Generic.xaml" />
</ItemGroup>
<Import Project="..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
<Import Project="..\Common.targets" />
<Target Name="_UnoToolkitOverrideNuget" AfterTargets="AfterBuild" DependsOnTargets="BuiltProjectOutputGroup" Condition="'$(UnoNugetOverrideVersion)'!=''">
<PropertyGroup>
<_OverrideTargetFramework>$(TargetFramework)</_OverrideTargetFramework>
<_OverrideTargetFramework Condition="'$(_OverrideTargetFramework)' == 'uap10.0.17763'">UAP</_OverrideTargetFramework>
<_baseNugetPath Condition="'$(USERPROFILE)'!=''">$(USERPROFILE)</_baseNugetPath>
<_baseNugetPath Condition="'$(HOME)'!=''">$(HOME)</_baseNugetPath>
<_TargetNugetFolder>$(_baseNugetPath)\.nuget\packages\Uno.UI\$(UnoNugetOverrideVersion)\lib\$(_OverrideTargetFramework)</_TargetNugetFolder>
</PropertyGroup>
<ItemGroup>
<_OutputFiles Include="$(TargetDir)**" />
</ItemGroup>
<MakeDir Directories="$(_TargetNugetFolder)" />
<Message Importance="high" Text="OVERRIDING NUGET PACKAGE CACHE: $(_TargetNugetFolder)" />
<Copy SourceFiles="@(_OutputFiles)" DestinationFiles="@(_OutputFiles->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(_OutputFilesPDB)" DestinationFiles="@(_OutputFilesPDB->'$(_TargetNugetFolder)\%(RecursiveDir)%(Filename).pdb')" />
</Target>
</Project>

533
src/Uno.UI.sln
Просмотреть файл

@ -207,12 +207,36 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme", "Uno.U
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.Skia", "Uno.UI.FluentTheme\Uno.UI.FluentTheme.Skia.csproj", "{E7113F80-584B-4DF1-9BF0-166BB453B807}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Uno.UI.Tests.ViewLibraryProps", "Uno.UI.Tests.ViewLibraryProps\Uno.UI.Tests.ViewLibraryProps.csproj", "{68090F3E-ACE3-49D0-BC68-151F8A92A38B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Tests.ViewLibraryProps", "Uno.UI.Tests.ViewLibraryProps\Uno.UI.Tests.ViewLibraryProps.csproj", "{68090F3E-ACE3-49D0-BC68-151F8A92A38B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RemoteControl.Server.Processors", "Uno.UI.RemoteControl.Server.Processors\Uno.UI.RemoteControl.Server.Processors.csproj", "{0C43E58D-3A77-4F2C-A2D3-08F98759AEE8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RemoteControl.Server", "Uno.UI.RemoteControl.Server\Uno.UI.RemoteControl.Server.csproj", "{D590CED3-7306-447A-A7BF-034777E4F1C1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Foundation.net6", "Uno.Foundation\Uno.Foundation.net6.csproj", "{C473858B-8ECF-4476-8CBA-05EA456FFE0E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.net6", "Uno.UWP\Uno.net6.csproj", "{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.net6", "Uno.UI\Uno.UI.net6.csproj", "{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.BindingHelper.Android.net6", "Uno.UI.BindingHelper.Android\Uno.UI.BindingHelper.Android.net6.csproj", "{1EC49129-3FB1-4045-9859-03F72CAD2913}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Xaml.net6", "SourceGenerators\System.Xaml\Uno.Xaml.net6.csproj", "{4DB56B75-B691-4F8B-879F-D7F36EEE6187}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplesApp.net6mobile", "SamplesApp\SamplesApp.net6mobile\SamplesApp.net6mobile.csproj", "{3C272635-C7D1-444C-86C2-CB95E367D13D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Toolkit.net6", "Uno.UI.Toolkit\Uno.UI.Toolkit.net6.csproj", "{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Lottie.net6", "AddIns\Uno.UI.Lottie\Uno.UI.Lottie.net6.csproj", "{CA07C58C-D4E6-4432-8241-55FA016DEA41}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RuntimeTests.net6", "Uno.UI.RuntimeTests\Uno.UI.RuntimeTests.net6.csproj", "{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.FluentTheme.net6", "Uno.UI.FluentTheme\Uno.UI.FluentTheme.net6.csproj", "{17802FE5-5A70-42DE-816A-FCC5776A3E02}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.MSAL.net6", "AddIns\Uno.UI.MSAL\Uno.UI.MSAL.net6.csproj", "{17BB7190-F406-4A26-9C44-4F494B24CF83}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.RemoteControl.net6", "Uno.UI.RemoteControl\Uno.UI.RemoteControl.net6.csproj", "{717B3451-3CE4-4FF3-9D7E-3E90348214EA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.UI.Runtime.Skia.Linux.FrameBuffer", "Uno.UI.Runtime.Skia.Linux.FrameBuffer\Uno.UI.Runtime.Skia.Linux.FrameBuffer.csproj", "{AA89E8AC-40EF-4911-99B5-55228188446A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SamplesApp.Skia.Linux.FrameBuffer", "SamplesApp\SamplesApp.Skia.Linux.FrameBuffer\SamplesApp.Skia.Linux.FrameBuffer.csproj", "{76EBBF09-F39F-48C2-BEE9-9DF5F8EC6A49}"
@ -227,6 +251,9 @@ Global
SamplesApp\SamplesApp.Shared\SamplesApp.Shared.projitems*{313fcf91-a6db-4585-a23e-49bbeef4784d}*SharedItemsImports = 4
SamplesApp\SamplesApp.UnitTests.Shared\SamplesApp.UnitTests.Shared.projitems*{313fcf91-a6db-4585-a23e-49bbeef4784d}*SharedItemsImports = 4
SamplesApp\UITests.Shared\UITests.Shared.projitems*{313fcf91-a6db-4585-a23e-49bbeef4784d}*SharedItemsImports = 4
SamplesApp\SamplesApp.Shared\SamplesApp.Shared.projitems*{3c272635-c7d1-444c-86c2-cb95e367d13d}*SharedItemsImports = 5
SamplesApp\SamplesApp.UnitTests.Shared\SamplesApp.UnitTests.Shared.projitems*{3c272635-c7d1-444c-86c2-cb95e367d13d}*SharedItemsImports = 5
SamplesApp\UITests.Shared\UITests.Shared.projitems*{3c272635-c7d1-444c-86c2-cb95e367d13d}*SharedItemsImports = 5
SamplesApp\Benchmarks.Shared\Benchmarks.Shared.projitems*{3fdf0f2d-cc11-49be-8634-f81638d595c6}*SharedItemsImports = 4
SamplesApp\SamplesApp.Shared\SamplesApp.Shared.projitems*{3fdf0f2d-cc11-49be-8634-f81638d595c6}*SharedItemsImports = 4
SamplesApp\SamplesApp.UnitTests.Shared\SamplesApp.UnitTests.Shared.projitems*{3fdf0f2d-cc11-49be-8634-f81638d595c6}*SharedItemsImports = 4
@ -3737,6 +3764,510 @@ Global
{D590CED3-7306-447A-A7BF-034777E4F1C1}.Release|x64.Build.0 = Release|Any CPU
{D590CED3-7306-447A-A7BF-034777E4F1C1}.Release|x86.ActiveCfg = Release|Any CPU
{D590CED3-7306-447A-A7BF-034777E4F1C1}.Release|x86.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|ARM64.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhone.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x64.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x64.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x86.ActiveCfg = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Debug|x86.Build.0 = Debug|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|Any CPU.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM64.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|ARM64.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhone.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhone.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x64.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x64.Build.0 = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x86.ActiveCfg = Release|Any CPU
{C473858B-8ECF-4476-8CBA-05EA456FFE0E}.Release|x86.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|ARM64.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhone.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x64.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x64.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x86.ActiveCfg = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Debug|x86.Build.0 = Debug|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|Any CPU.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM64.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|ARM64.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhone.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhone.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x64.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x64.Build.0 = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x86.ActiveCfg = Release|Any CPU
{2C4D969A-AF2B-4C78-AF04-5ECE47F7D14C}.Release|x86.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|ARM64.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhone.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x64.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x64.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x86.ActiveCfg = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Debug|x86.Build.0 = Debug|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|Any CPU.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM64.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|ARM64.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhone.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhone.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x64.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x64.Build.0 = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x86.ActiveCfg = Release|Any CPU
{C1AF1FBC-D11D-441D-AD07-5FF2FE295C0D}.Release|x86.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|ARM.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|ARM.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|ARM64.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|iPhone.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|x64.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|x64.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|x86.ActiveCfg = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Debug|x86.Build.0 = Debug|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|Any CPU.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|ARM.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|ARM.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|ARM64.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|ARM64.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|iPhone.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|iPhone.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|x64.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|x64.Build.0 = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|x86.ActiveCfg = Release|Any CPU
{1EC49129-3FB1-4045-9859-03F72CAD2913}.Release|x86.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|ARM64.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhone.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x64.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x64.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x86.ActiveCfg = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Debug|x86.Build.0 = Debug|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|Any CPU.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM64.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|ARM64.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhone.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhone.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x64.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x64.Build.0 = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x86.ActiveCfg = Release|Any CPU
{4DB56B75-B691-4F8B-879F-D7F36EEE6187}.Release|x86.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|ARM.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|ARM.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|ARM64.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|iPhone.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|x64.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|x64.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|x86.ActiveCfg = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Debug|x86.Build.0 = Debug|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|Any CPU.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|ARM.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|ARM.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|ARM64.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|ARM64.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|iPhone.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|iPhone.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|x64.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|x64.Build.0 = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|x86.ActiveCfg = Release|Any CPU
{3C272635-C7D1-444C-86C2-CB95E367D13D}.Release|x86.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|ARM64.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhone.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x64.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x64.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x86.ActiveCfg = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Debug|x86.Build.0 = Debug|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|Any CPU.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM64.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|ARM64.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhone.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhone.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x64.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x64.Build.0 = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x86.ActiveCfg = Release|Any CPU
{7B3AC6D8-2660-4FC2-9633-F8DFC0F32012}.Release|x86.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|ARM.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|ARM.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|ARM64.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|iPhone.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|x64.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|x64.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|x86.ActiveCfg = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Debug|x86.Build.0 = Debug|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|Any CPU.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|ARM.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|ARM.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|ARM64.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|ARM64.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|iPhone.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|iPhone.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x64.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x64.Build.0 = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x86.ActiveCfg = Release|Any CPU
{CA07C58C-D4E6-4432-8241-55FA016DEA41}.Release|x86.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|ARM.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|ARM64.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|iPhone.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|x64.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|x64.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|x86.ActiveCfg = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Debug|x86.Build.0 = Debug|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|Any CPU.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|ARM.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|ARM.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|ARM64.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|ARM64.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|iPhone.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|iPhone.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|x64.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|x64.Build.0 = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|x86.ActiveCfg = Release|Any CPU
{4A5E7CC0-881A-450F-91E0-F5D66F559ADF}.Release|x86.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|ARM64.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhone.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x64.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x64.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x86.ActiveCfg = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Debug|x86.Build.0 = Debug|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|Any CPU.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM64.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|ARM64.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhone.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhone.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x64.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x64.Build.0 = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x86.ActiveCfg = Release|Any CPU
{17802FE5-5A70-42DE-816A-FCC5776A3E02}.Release|x86.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|ARM64.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhone.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x64.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x64.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x86.ActiveCfg = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Debug|x86.Build.0 = Debug|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|Any CPU.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM64.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|ARM64.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhone.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhone.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x64.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x64.Build.0 = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x86.ActiveCfg = Release|Any CPU
{17BB7190-F406-4A26-9C44-4F494B24CF83}.Release|x86.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|ARM64.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhone.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x64.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x64.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x86.ActiveCfg = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Debug|x86.Build.0 = Debug|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|Any CPU.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|Any CPU.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM64.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|ARM64.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhone.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhone.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhoneSimulator.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|iPhoneSimulator.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x64.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x64.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x86.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release_NoSamples|x86.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|Any CPU.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM64.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|ARM64.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhone.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhone.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x64.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x64.Build.0 = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x86.ActiveCfg = Release|Any CPU
{717B3451-3CE4-4FF3-9D7E-3E90348214EA}.Release|x86.Build.0 = Release|Any CPU
{AA89E8AC-40EF-4911-99B5-55228188446A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AA89E8AC-40EF-4911-99B5-55228188446A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AA89E8AC-40EF-4911-99B5-55228188446A}.Debug|ARM.ActiveCfg = Debug|Any CPU

2
src/Uno.UI/Controls/Window.iOS.cs
Просмотреть файл

@ -191,9 +191,11 @@ namespace Uno.UI.Controls
private void OnKeyboardWillShow(object sender, UIKeyboardEventArgs e)
{
#if !MACCATALYST
var keyboardRect = ((NSValue)e.Notification.UserInfo.ObjectForKey(UIKeyboard.BoundsUserInfoKey)).RectangleFValue;
var windowRect = Windows.UI.Xaml.Window.Current.Bounds;
_inputPane.OccludedRect = new Rect(0, windowRect.Height - keyboardRect.Height, keyboardRect.Width, keyboardRect.Height);
#endif
}
private void OnKeyboardWillHide(object sender, UIKeyboardEventArgs e)

10
src/Uno.UI/MixinGeneration.targets
Просмотреть файл

@ -5,8 +5,12 @@
<T4Path>$(MSBuildThisFileDirectory)..\T4Generator\bin\$(Configuration)</T4Path>
<T4Bin>$(T4Path)\T4Generator.exe</T4Bin>
<IsMonoAndroid>$(TargetFramework.ToLower().StartsWith('monoandroid'))</IsMonoAndroid>
<IsXamarinIOS>$(TargetFramework.ToLower().StartsWith('xamarinios'))</IsXamarinIOS>
<IsMonoAndroid>false</IsMonoAndroid>
<IsMonoAndroid Condition="'$(TargetFramework)'=='net6.0-android' or $(TargetFramework.ToLower().StartsWith('monoandroid'))">true</IsMonoAndroid>
<IsXamarinIOS>false</IsXamarinIOS>
<IsXamarinIOS Condition="'$(TargetFramework)'=='net6.0-ios' or '$(TargetFramework)'=='net6.0-maccatalyst' or $(TargetFramework.ToLower().StartsWith('xamarinios'))">true</IsXamarinIOS>
<IsXamarinMac>$(TargetFramework.ToLower().StartsWith('xamarinmac'))</IsXamarinMac>
<IsReferenceAPI>false</IsReferenceAPI>
<IsReferenceAPI Condition="'$(TargetFramework)'=='netstandard2.0' or '$(TargetFramework)'=='net5.0'">true</IsReferenceAPI>
@ -175,7 +179,7 @@
<Target Name="_InnerGenerateMixins">
<PropertyGroup>
<_MonoPrefix Condition="'$(MSBuildRuntimeType)'=='Core'">mono</_MonoPrefix>
<_MonoPrefix Condition="'$(MSBuildRuntimeType)'=='Core' and $([MSBuild]::IsOSUnixLike())">mono</_MonoPrefix>
</PropertyGroup>
<Exec Command="$(_MonoPrefix) &quot;$(T4Bin)&quot; $(InputFile) $(OutputPath)" />

2
src/Uno.UI/UI/Xaml/Controls/FlipView/FlipViewSource.iOS.cs
Просмотреть файл

@ -60,6 +60,7 @@ namespace Windows.UI.Xaml.Controls
return 1;
}
#if !MACCATALYST
public override void DraggingEnded(UIScrollView scrollView, bool willDecelerate)
{
try
@ -84,6 +85,7 @@ namespace Windows.UI.Xaml.Controls
{
UpdateCurrentPage(scrollView);
}
#endif
private void UpdateCurrentPage(UIScrollView scrollView)
{

4
src/Uno.UI/UI/Xaml/Controls/ListViewBase/ListViewBaseSource.iOS.cs
Просмотреть файл

@ -391,6 +391,7 @@ namespace Windows.UI.Xaml.Controls
internal void SetIsAnimatedScrolling() => _isInAnimatedScroll = true;
#if !MACCATALYST
public override void Scrolled(UIScrollView scrollView)
{
InvokeOnScroll();
@ -430,6 +431,7 @@ namespace Windows.UI.Xaml.Controls
// obvious what it would be in the case of a list).
Owner.XamlParent?.ScrollViewer?.OnZoomInternal((float)Owner.ZoomScale);
}
#endif
private void OnAnimatedScrollEnded()
{
@ -447,6 +449,7 @@ namespace Windows.UI.Xaml.Controls
Owner.XamlParent?.ScrollViewer?.OnScrollInternal(clampedOffset.X, clampedOffset.Y, isIntermediate: _isInAnimatedScroll);
}
#if !MACCATALYST
public override void WillEndDragging(UIScrollView scrollView, CGPoint velocity, ref CGPoint targetContentOffset)
{
// If snap points are enabled, override the target offset with the calculated snap point.
@ -456,6 +459,7 @@ namespace Windows.UI.Xaml.Controls
targetContentOffset = snapTo.Value;
}
}
#endif
#endregion

260
src/Uno.UI/Uno.UI.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,260 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Uno.UI</AssemblyName>
<RootNamespace>Uno.UI</RootNamespace>
<DefineConstants>$(DefineConstants);IS_UNO</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BuildForLiveUnitTesting>false</BuildForLiveUnitTesting>
<NoWarn>$(NoWarn);NU1701;1572;1587;419;1574;1711;1734;CS0105</NoWarn>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>disable</Nullable>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<UnoRuntimeIdentifier Condition="'$(TargetFramework)'=='netstandard2.0'">Reference</UnoRuntimeIdentifier>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<AndroidResgenFile>obj\$(TargetFramework)\Resources\Resource.Designer.cs</AndroidResgenFile>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<!-- Force the generation of upri files for Uno.UI self localization -->
<UnoForceProcessPRIResource>true</UnoForceProcessPRIResource>
<!-- Generate automation IDs in debug builds, use by UI tests. -->
<IsUiAutomationMappingEnabled Condition="'$(Configuration)'=='Debug'">true</IsUiAutomationMappingEnabled>
<!-- Disable WPF targets -->
<ImportFrameworkWinFXTargets>false</ImportFrameworkWinFXTargets>
</PropertyGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<ItemGroup>
<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml;Themes\WinUI\Resources\**\*.xaml;" Visible="False" />
<UpToDateCheckInput Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs;" Visible="False" />
<UpToDateCheckInput Include="**\*.tt" Exclude="bin\**\*.tt;obj\**\*.tt;" Visible="False" />
</ItemGroup>
<Choose>
<When Condition="'$(TargetFramework)'=='net461'">
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
</ItemGroup>
</When>
<When Condition="'$(TargetFramework)'=='netstandard2.0'">
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
<!-- Remove all xaml files as netstandard2.0 is the reference target and won't be used at runtime -->
<Page Remove="@(Page)" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
<!-- remove files included by msbuild extras -->
<Page Remove="@(Page)" />
<Page Include="$(MSBuildThisFileDirectory)**/*.xaml" Exclude="bin/**/*.xaml;obj/**/*.xaml;Themes\WinUI\Resources\**\*.xaml;" />
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<None Include="Extensions\CGSizeExtensions.iOSmacOS.cs" />
<None Include="Mixins\Android\BaseActivity.Callbacks.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\Android\FrameworkElementMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\Android\VisualStatesMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\iOS\FrameworkElementMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\iOS\VisualStatesMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\macOS\FrameworkElementMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\macOS\VisualStatesMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\net461\VisualStatesMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Mixins\Wasm\VisualStatesMixins.g.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
</None>
<None Include="Resources\AboutResources.txt" />
<None Include="Resources\Values\Attrs.xml" />
<None Include="Resources\Values\Styles.xml" />
<None Include="Resources\IResourceRegistry.cs" />
<None Include="Resources\ResourceRegistry.cs" />
<None Include="UI\Xaml\Controls\Panel\Panel.macOS.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.SourceGenerationTasks" />
<PackageReference Include="Uno.Core" Version="2.0.0" />
<PackageReference Include="Uno.Core.Build" Version="2.0.0" />
<PackageReference Include="Uno.MonoAnalyzers" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Memory" Version="4.5.2" />
<PackageReference Include="xamarin.build.download" Version="0.4.11" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-android'">
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
<PackageReference Include="Xamarin.AndroidX.RecyclerView" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.net6.csproj">
<TreatAsPackageReference>false</TreatAsPackageReference>
</ProjectReference>
<ProjectReference Include="..\Uno.UWP\Uno.net6.csproj">
<TreatAsPackageReference>false</TreatAsPackageReference>
</ProjectReference>
<ProjectReference Include="..\SourceGenerators\System.Xaml\Uno.Xaml.net6.csproj" />
<ProjectReference Include="..\Uno.UI.BindingHelper.Android\Uno.UI.BindingHelper.Android.net6.csproj" Condition="'$(TargetFramework)' == 'net6.0-android'">
<TreatAsPackageReference>false</TreatAsPackageReference>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Microsoft\UI\Xaml\Controls\ProgressRing\ProgressRingIntdeterminate.json" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
<!-- Remove the reference added automatically by msbuild extras -->
<Reference Remove="PresentationFramework" />
<Reference Remove="PresentationCore" />
<Reference Remove="WindowsBase" />
<Reference Remove="System.Xaml" />
</ItemGroup>
<PropertyGroup>
<UnoUIMSBuildTasksPath>$(MSBuildThisFileDirectory)..\SourceGenerators\Uno.UI.Tasks\bin\$(Configuration)_Shadow</UnoUIMSBuildTasksPath>
</PropertyGroup>
<Import Project="..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
<Import Project="..\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" Condition="'$(SkipUnoResourceGeneration)' == '' " />
<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
<ItemGroup>
<Folder Include="UI\Xaml\Maps\Presenters\" />
</ItemGroup>
<ItemGroup>
<PRIResource Include="**\*.resw" />
</ItemGroup>
<ItemGroup Condition="'$(DocsGeneration)'==''">
<ProjectReference Include="..\SourceGenerators\Uno.UI.SourceGenerators\Uno.UI.SourceGenerators.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<UndefineProperties>TargetFramework</UndefineProperties>
</ProjectReference>
<ProjectReference Include="..\SourceGenerators\Uno.UI.Tasks\Uno.UI.Tasks.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
<UndefineProperties>TargetFramework</UndefineProperties>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Update="Mixins\Android\BaseActivity.Callbacks.tt">
<LastGenOutput>BaseActivity.Callbacks.g.cs</LastGenOutput>
</None>
<None Update="Mixins\Android\FrameworkElementMixins.tt">
<LastGenOutput>FrameworkElementMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\Android\VisualStatesMixins.tt">
<LastGenOutput>VisualStatesMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\iOS\FrameworkElementMixins.tt">
<LastGenOutput>FrameworkElementMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\iOS\VisualStatesMixins.tt">
<LastGenOutput>VisualStatesMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\macOS\FrameworkElementMixins.tt">
<LastGenOutput>FrameworkElementMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\macOS\VisualStatesMixins.tt">
<LastGenOutput>VisualStatesMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\net461\VisualStatesMixins.tt">
<LastGenOutput>VisualStatesMixins.g.cs</LastGenOutput>
</None>
<None Update="Mixins\Wasm\VisualStatesMixins.tt">
<LastGenOutput>VisualStatesMixins.g.cs</LastGenOutput>
</None>
</ItemGroup>
<Target Name="GetPackagingOutputs" Condition=" '$(TargetFramework)' == 'uap10.0' " />
<Target Name="GetBuiltProjectOutputRecursive" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
<Target Name="GetTargetPath" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
<Target Name="GetNativeManifest" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
<Target Name="GetBuiltProjectOutputRecursive" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(MSBuildVersion)' &gt;= '16.0' and $([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>
<Target Name="VS16_RemoveSystemMemory" BeforeTargets="FindReferenceAssembliesForReferences" Condition="'$(MSBuildVersion)' &gt;= '16.0' and ($(IsMonoAndroid) or $(IsXamarinIOS) or $(IsXamarinMac))">
<ItemGroup>
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" />
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
<Import Project="MixinGeneration.targets" />
</Project>

2
src/Uno.UWP/Security/Authentication/Web/WebAuthenticationBrokerProvider.Android.cs
Просмотреть файл

@ -102,7 +102,7 @@ namespace Uno.AuthenticationBroker
var result = await tcs!.Task;
if(Interlocked.CompareExchange(ref _completionSource, null, tcs) == tcs)
if(Interlocked.CompareExchange(ref _completionSource, null!, tcs) == tcs)
{
_waitingForCallbackUri = null;
}

8
src/Uno.UWP/UI/Composition/Uno/CompositorThread.android.cs
Просмотреть файл

@ -165,7 +165,11 @@ namespace Uno.UI.Composition
if (!TryStop(() => _looper?.Quit())
&& !TryStop(() => thread.Interrupt())
&& !TryStop(() => thread.Abort()))
#if !NET6_0_OR_GREATER
&& !TryStop(() => thread.Abort())
#endif
)
{
if (this.Log().IsEnabled(LogLevel.Error))
{
@ -205,7 +209,9 @@ namespace Uno.UI.Composition
}
catch (ThreadAbortException)
{
#if !NET6_0_OR_GREATER
Thread.ResetAbort();
#endif
}
}

108
src/Uno.UWP/Uno.net6.csproj Normal file
Просмотреть файл

@ -0,0 +1,108 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
</PropertyGroup>
<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">
<TargetFrameworks>$(UnoTargetFrameworkOverride)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AssemblyName>Uno</AssemblyName>
<RootNamespace>Windows</RootNamespace>
<DefineConstants>$(DefineConstants);XAMARIN;IS_UNO;HAS_UMBRELLA_UI;HAS_UMBRELLA_BINDING;HAS_CRIPPLEDREFLECTION</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
<AndroidResgenFile>obj\$(TargetFramework)\Resources\Resource.Designer.cs</AndroidResgenFile>
<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
<GenerateLibraryLayout>true</GenerateLibraryLayout>
<NoWarn>$(NoWarn);NU1701</NoWarn>
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
<Deterministic>true</Deterministic>
<!--
Use to avoid namespace conflicts with the default namespace of this
assembly, for non-fully qualified types in System and Windows.System
-->
<AndroidResgenNamespace>Uno.UWP</AndroidResgenNamespace>
<UnoSourceGeneratorCaptureGenerationHostOutput>true</UnoSourceGeneratorCaptureGenerationHostOutput>
</PropertyGroup>
<Import Project="..\Uno.CrossTargetting.props" />
<ItemGroup>
<UpToDateCheckInput Include="**\*.cs" Exclude="bin\**\*.cs;obj\**\*.cs;" Visible="False" />
</ItemGroup>
<ItemGroup>
<UpToDateCheckInput Remove="UI\Composition\ICompositionSurface.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="Uno.SourceGenerationTasks" />
<PackageReference Include="Uno.Core" />
<PackageReference Include="Uno.MonoAnalyzers" />
<PackageReference Include="System.Memory" Version="4.5.2" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid11.0'">
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
<PackageReference Include="Xamarin.AndroidX.Fragment" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-android'">
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
<PackageReference Include="Xamarin.AndroidX.Fragment" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'MonoAndroid10.0'">
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.v4" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" />
</ItemGroup>
<ItemGroup Condition="$(IsMonoAndroid) or $(IsXamarinIOS) or '$(TargetFramework)'=='xamarinmac20'">
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors" />
<Reference Include="System.Memory" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Uno.Foundation\Uno.Foundation.net6.csproj" />
</ItemGroup>
<Target Name="GetBuiltProjectOutputRecursive" Condition=" '$(TargetFramework)' == 'xamarinios10' " />
<Target Name="VS16Mac_RemoveSystemMemory" BeforeTargets="ResolveAssemblyReferences" Condition="'$(MSBuildVersion)' &gt;= '16.0' and $([MSBuild]::IsOsPlatform('OSX'))">
<!--
VS4Mac seems to process System.Memory differently, and removes
the System.Memory local reference if the package is transitively referenced.
We remove the Reference added by the nuget targets so that ResolveAssemblyReferences
is properly adding the local System.Memory to the Reference item group.
-->
<ItemGroup>
<_ReferenceToRemove Include="@(Reference)" Condition="'%(Reference.Identity)'=='System.Memory'" />
<Reference Remove="@(_ReferenceToRemove)" />
</ItemGroup>
</Target>
<Target Name="VS16_RemoveSystemMemory" BeforeTargets="FindReferenceAssembliesForReferences" Condition="'$(MSBuildVersion)' &gt;= '16.0' and ($(IsMonoAndroid) or $(IsXamarinIOS) or $(IsXamarinMac))">
<ItemGroup>
<_ReferencePathToRemove Include="@(ReferencePath)" Condition="'%(ReferencePath.NuGetPackageId)'=='System.Memory'" />
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
</Project>

2
src/Uno.UWP/Web/Http/HttpCookie.cs
Просмотреть файл

@ -20,7 +20,7 @@ namespace Windows.Web.Http
/// <param name="domain">The domain for which the HttpCookie is valid.</param>
/// <param name="path">The URIs to which the HttpCookie applies.</param>
/// <remarks>
/// For parameter value limitations <see cref="https://docs.microsoft.com/en-us/uwp/api/windows.web.http.httpcookie.-ctor?view=winrt-19041#remarks">UWP docs.</see>
/// For parameter value limitations https://docs.microsoft.com/en-us/uwp/api/windows.web.http.httpcookie.-ctor?view=winrt-19041#remarks UWP docs.
/// </remarks>
public HttpCookie(string name, string domain, string path)
{

44
src/Uno.WinUIRevert/Program.cs
Просмотреть файл

@ -13,28 +13,28 @@ namespace UnoWinUIRevert
{
var basePath = args[0];
DeleteFolder(Path.Combine(basePath, @"src\Uno.UI\Generated"));
DeleteFolder(Path.Combine(basePath, @"src\Uno.UWP\Generated"));
DeleteFolder(Path.Combine(basePath, @"src\Uno.UI\UI\Composition"));
DeleteFolder(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Controls\ProgressBar")); // ProgressBar in WinUI is a replacement of the UWP's version.
DeleteFolder(Path.Combine(basePath, "src", "Uno.UI", "Generated"));
DeleteFolder(Path.Combine(basePath, "src", "Uno.UWP", "Generated"));
DeleteFolder(Path.Combine(basePath, "src", "Uno.UI", "UI", "Composition"));
DeleteFolder(Path.Combine(basePath, "src", "Uno.UI", "UI", "Xaml", "Controls", "ProgressBar")); // ProgressBar in WinUI is a replacement of the UWP's version.
var compositionPath = Path.Combine(basePath, @"src\Uno.UWP\UI\Composition");
var compositionPath = Path.Combine(basePath, @"src", "Uno.UWP", "UI", "Composition");
if (Directory.Exists(compositionPath))
{
Console.WriteLine(@"Moving composition");
Directory.Move(compositionPath, Path.Combine(basePath, @"src\Uno.UI\UI\Composition"));
Directory.Move(compositionPath, Path.Combine(basePath, @"src", "Uno.UI", "UI", "Composition"));
}
var colorsFilepath = Path.Combine(basePath, @"src\Uno.UWP\UI\Colors.cs");
var colorsFilepath = Path.Combine(basePath, @"src", "Uno.UWP", "UI", "Colors.cs");
if (File.Exists(colorsFilepath))
{
File.Copy(colorsFilepath, Path.Combine(basePath, @"src\Uno.UI\UI\Colors.cs"), true);
File.Copy(colorsFilepath, Path.Combine(basePath, @"src", "Uno.UI", "UI", "Colors.cs"), true);
}
var colorHelperFilePath = Path.Combine(basePath, @"src\Uno.UWP\UI\ColorHelper.cs");
var colorHelperFilePath = Path.Combine(basePath, @"src", "Uno.UWP", "UI", "ColorHelper.cs");
if (File.Exists(colorHelperFilePath))
{
File.Copy(colorHelperFilePath, Path.Combine(basePath, @"src\Uno.UI\UI\ColorHelper.cs"), true);
File.Copy(colorHelperFilePath, Path.Combine(basePath, @"src", "Uno.UI", "UI", "ColorHelper.cs"), true);
}
// Files/Class that are implemented in both MUX and WUX and which should not be converted
@ -66,19 +66,19 @@ namespace UnoWinUIRevert
("Microsoft.UI.Xaml.Controls", "Uno.UI.Controls.Legacy"),
};
ReplaceInFolders(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Controls\ProgressRing"), progressRingReplacements);
ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Controls\ProgressRing\ProgressRing.xaml"), "\"ProgressRing\"", "\"legacy:ProgressRing\"");
ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Style\Generic\Generic.Native.xaml"), "ProgressRing", "legacy:ProgressRing");
ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\Microsoft\UI\Xaml\Controls\ProgressRing\ProgressRing.xaml"), "using:Windows.UI.Xaml.Controls", "using:Uno.UI.Controls.Legacy");
ReplaceInFolders(Path.Combine(basePath, @"src", "Uno.UI", "UI", "Xaml", "Controls", "ProgressRing"), progressRingReplacements);
ReplaceInFile(Path.Combine(basePath, @"src", "Uno.UI", "UI", "Xaml", "Controls", "ProgressRing", "ProgressRing.xaml"), "\"ProgressRing\"", "\"legacy:ProgressRing\"");
ReplaceInFile(Path.Combine(basePath, @"src", "Uno.UI", "UI", "Xaml", "Style", "Generic", "Generic.Native.xaml"), "ProgressRing", "legacy:ProgressRing");
ReplaceInFile(Path.Combine(basePath, @"src", "Uno.UI", "Microsoft", "UI", "Xaml", "Controls", "ProgressRing", "ProgressRing.xaml"), "using:Windows.UI.Xaml.Controls", "using:Uno.UI.Controls.Legacy");
// Restore DualPaneView XAML
// ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\Microsoft\UI\Xaml\Controls\TwoPaneView\TwoPaneView.xaml"), "using:Windows.UI.Xaml.Controls", "using:Windows.UI.Xaml.Controls");
// Adjust Colors
ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\Colors.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\ColorHelper.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src\SourceGenerators\Uno.UI.SourceGenerators\XamlGenerator\XamlConstants.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Markup\Reader\XamlConstants.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src", "Uno.UI", "UI", "Colors.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src", "Uno.UI", "UI", "ColorHelper.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src", "SourceGenerators", "Uno.UI.SourceGenerators", "XamlGenerator", "XamlConstants.cs"), "Windows.UI", "Microsoft.UI");
ReplaceInFile(Path.Combine(basePath, @"src", "Uno.UI", "UI", "Xaml", "Markup", "Reader", "XamlConstants.cs"), "Windows.UI", "Microsoft.UI");
// Custom animation
// ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Media\Animation\Animators\RenderingLoopAnimator.wasm.cs"), "Microsoft", "Windows");
@ -96,7 +96,7 @@ namespace UnoWinUIRevert
//ReplaceInFile(Path.Combine(basePath, @"src\Uno.UI\UI\Xaml\Media\RadialGradientBrush.wasm.cs"), "namespace Windows.UI.Xaml.Controls", "namespace Windows.UI.Xaml.Controls");
}
static string[] _exclusions = new[] {
static string[] _exclusions = new string[] {
"Uno.UWPSyncGenerator.Reference.csproj",
"SamplesApp.UWP.csproj",
"SamplesApp.UWP.Design.csproj",
@ -108,7 +108,11 @@ namespace UnoWinUIRevert
@"\bin\",
@"\.git",
@"\.vs",
};
}
.Select(AlignPath)
.ToArray();
private static string AlignPath(string p) => p.Replace('\\', Path.DirectorySeparatorChar);
private static void ReplaceInFolders(string basePath, (string from, string to)[] replacements, string searchPattern = "*.*")
{

40
src/crosstargeting_override.props.sample
Просмотреть файл

@ -1,29 +1,33 @@
<Project ToolsVersion="15.0">
<!--
This file is used to control the platforms compiled by visual studio, and
allow for a faster build when testing for a single platform.
<!--
This file is used to control the platforms compiled by visual studio, and
allow for a faster build when testing for a single platform.
Instructions:
1) Copy this file and remove the ".sample" name
2) Uncomment and adjust the UnoNugetOverrideVersion property below
3) Make sure to do a Rebuild, so that nuget restores the proper packages for the new target
-->
Instructions:
1) Copy this file and remove the ".sample" name
2) Uncomment and adjust the UnoNugetOverrideVersion property below
3) Make sure to do a Rebuild, so that nuget restores the proper packages for the new target
-->
<PropertyGroup>
<IsUnoUIProject>false</IsUnoUIProject>
<IsUnoUIProject Condition="'$(AssemblyName)'=='Uno' or '$(AssemblyName)'=='Uno.UI' or '$(AssemblyName)'=='Uno.Foundation'">true</IsUnoUIProject>
<!--
This property controls the platform built by Visual Studio.
Available build targets and corresponding solution filters:
uap10.0.17763 (Windows) - Uno.UI-Windows-only.slnf
xamarinios10 (iOS) - Uno.UI-iOS-only.slnf
MonoAndroid11.0 (Android 11.0) - Uno.UI-Android-only.slnf
netstandard2.0 (WebAssembly, Skia) - Uno.UI-Wasm-only.slnf, Uno.UI-Skia-only.slnf
net5.0 (WebAssembly, Skia) - Uno.UI-Wasm-only.slnf, Uno.UI-Skia-only.slnf
xamarinmac20 (macOS) - Uno.UI-macOS-only.slnf (Visual Studio for Windows), Uno.UI-vs4mac-macOS-only.sln (Visual Studio for Mac)
net461 (Uno.UI.Tests) - Uno.UI-UnitTests-only.slnf
This property controls the platform built by Visual Studio.
Available build targets and corresponding solution filters:
uap10.0.17763 (Windows) - Uno.UI-Windows-only.slnf
xamarinios10 (iOS) - Uno.UI-iOS-only.slnf
MonoAndroid11.0 (Android 11.0) - Uno.UI-Android-only.slnf
netstandard2.0 (WebAssembly, Skia) - Uno.UI-Wasm-only.slnf, Uno.UI-Skia-only.slnf
net5.0 (WebAssembly, Skia) - Uno.UI-Wasm-only.slnf, Uno.UI-Skia-only.slnf
net6.0-ios (.NET 6 iOS) - Uno.UI-net6-only.slnf
net6.0-android (.NET 6 Android) - Uno.UI-net6-only.slnf
net6.0-maccatalyst (.NET 6 macOS Catalyst) - Uno.UI-net6-only.slnf
xamarinmac20 (macOS) - Uno.UI-macOS-only.slnf (Visual Studio for Windows), Uno.UI-vs4mac-macOS-only.sln (Visual Studio for Mac)
net461 (Uno.UI.Tests) - Uno.UI-UnitTests-only.slnf
Only one target can be built, and the corresponding solution filter must
be loaded in Visual Studio (see next to Uno.UI.sln).

11
src/global-net6.json Normal file
Просмотреть файл

@ -0,0 +1,11 @@
{
"msbuild-sdks": {
"MSBuild.Sdk.Extras": "3.0.22",
"Xamarin.Legacy.Sdk": "0.1.0-alpha2"
},
"sdk": {
"version": "6.0.100-preview.4.21255.9",
"rollForward": "disable",
"allowPrerelease": true
}
}

3
src/nuget.config
Просмотреть файл

@ -4,5 +4,8 @@
<add key="NuGet official package source" value="https://api.nuget.org/v3/index.json" />
<add key="platform.uno dev" value="https://uno-platform.pkgs.visualstudio.com/Uno%20Platform/_packaging/unoplatformdev/nuget/v3/index.json" />
<add key="Solution Packages" value="PackageCache" />
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
<add key="xamarin" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/xamarin-impl/nuget/v3/index.json" />
<add key="public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
</packageSources>
</configuration>