From 8ff83f433f9607fa4fb42be111da4a6dd7e46ba3 Mon Sep 17 00:00:00 2001 From: Maksym Katsydan Date: Sat, 13 Nov 2021 21:54:53 -0500 Subject: [PATCH 1/3] Include MSIX project to the solution --- .../AvaloniaControlsGallery.wapproj | 9 +- XamlControlsGallery.sln | 104 +++++++++++++----- 2 files changed, 78 insertions(+), 35 deletions(-) diff --git a/WindowsStorePackage/AvaloniaControlsGallery.wapproj b/WindowsStorePackage/AvaloniaControlsGallery.wapproj index 8f87e52..ad8f92d 100644 --- a/WindowsStorePackage/AvaloniaControlsGallery.wapproj +++ b/WindowsStorePackage/AvaloniaControlsGallery.wapproj @@ -55,12 +55,12 @@ 10.0.17763.0 en-US false - ..\XamlControlsGallery\XamlControlsGallery.csproj False True True - x86|x64 + x64 0 + ..\XamlControlsGallery.NetCore\XamlControlsGallery.NetCore.csproj en-GB @@ -108,6 +108,7 @@ + @@ -162,9 +163,7 @@ - - True - + \ No newline at end of file diff --git a/XamlControlsGallery.sln b/XamlControlsGallery.sln index f3b7434..dd90ff7 100644 --- a/XamlControlsGallery.sln +++ b/XamlControlsGallery.sln @@ -5,26 +5,28 @@ VisualStudioVersion = 16.0.30104.148 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlControlGallery.iOS", "XamlControlGallery.iOS\XamlControlGallery.iOS.csproj", "{B0416C49-9EA5-4274-9F70-DC58E5FE1D64}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlControlsGallery", "XamlControlsGallery\XamlControlsGallery.csproj", "{D1E15C93-DE5C-4939-98AF-26AC550B2611}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlControlsGallery", "XamlControlsGallery\XamlControlsGallery.csproj", "{D1E15C93-DE5C-4939-98AF-26AC550B2611}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XamlControlsGallery.NetCore", "XamlControlsGallery.NetCore\XamlControlsGallery.NetCore.csproj", "{3A578A47-76AD-4071-8E4F-E1E2D755756B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlControlsGallery.NetCore", "XamlControlsGallery.NetCore\XamlControlsGallery.NetCore.csproj", "{3A578A47-76AD-4071-8E4F-E1E2D755756B}" +EndProject +Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "AvaloniaControlsGallery", "WindowsStorePackage\AvaloniaControlsGallery.wapproj", "{2E5AD405-A55D-45EE-B125-B236AB5D4FCE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 + Debug|iPhone = Debug|iPhone + Debug|iPhoneSimulator = Debug|iPhoneSimulator Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 + Release|iPhone = Release|iPhone + Release|iPhoneSimulator = Release|iPhoneSimulator Release|x64 = Release|x64 Release|x86 = Release|x86 - Debug|iPhoneSimulator = Debug|iPhoneSimulator - Release|iPhoneSimulator = Release|iPhoneSimulator - Debug|iPhone = Debug|iPhone - Release|iPhone = Release|iPhone EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator @@ -33,6 +35,10 @@ Global {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|ARM.Build.0 = Debug|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|ARM64.ActiveCfg = Debug|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|ARM64.Build.0 = Debug|iPhoneSimulator + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhone.ActiveCfg = Debug|iPhone + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhone.Build.0 = Debug|iPhone + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|x64.ActiveCfg = Debug|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|x64.Build.0 = Debug|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|x86.ActiveCfg = Debug|iPhoneSimulator @@ -43,24 +49,24 @@ Global {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|ARM.Build.0 = Release|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|ARM64.Build.0 = Release|iPhoneSimulator + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhone.ActiveCfg = Release|iPhone + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhone.Build.0 = Release|iPhone + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator + {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|x64.ActiveCfg = Release|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|x64.Build.0 = Release|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|x86.ActiveCfg = Release|iPhoneSimulator {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|x86.Build.0 = Release|iPhoneSimulator - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhone.ActiveCfg = Debug|iPhone - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Debug|iPhone.Build.0 = Debug|iPhone - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhone.ActiveCfg = Release|iPhone - {B0416C49-9EA5-4274-9F70-DC58E5FE1D64}.Release|iPhone.Build.0 = Release|iPhone {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|ARM.ActiveCfg = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|ARM.Build.0 = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|ARM64.ActiveCfg = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|ARM64.Build.0 = Debug|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhone.Build.0 = Debug|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|x64.ActiveCfg = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|x64.Build.0 = Debug|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -71,24 +77,24 @@ Global {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|ARM.Build.0 = Release|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|ARM64.ActiveCfg = Release|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|ARM64.Build.0 = Release|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhone.ActiveCfg = Release|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhone.Build.0 = Release|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|x64.ActiveCfg = Release|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|x64.Build.0 = Release|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|x86.ActiveCfg = Release|Any CPU {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|x86.Build.0 = Release|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Debug|iPhone.Build.0 = Debug|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhone.ActiveCfg = Release|Any CPU - {D1E15C93-DE5C-4939-98AF-26AC550B2611}.Release|iPhone.Build.0 = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|ARM.ActiveCfg = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|ARM.Build.0 = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|ARM64.ActiveCfg = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|ARM64.Build.0 = Debug|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhone.Build.0 = Debug|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|x64.ActiveCfg = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|x64.Build.0 = Debug|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -99,18 +105,56 @@ Global {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|ARM.Build.0 = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|ARM64.ActiveCfg = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|ARM64.Build.0 = Release|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhone.ActiveCfg = Release|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhone.Build.0 = Release|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|x64.ActiveCfg = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|x64.Build.0 = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|x86.ActiveCfg = Release|Any CPU {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|x86.Build.0 = Release|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Debug|iPhone.Build.0 = Debug|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhone.ActiveCfg = Release|Any CPU - {3A578A47-76AD-4071-8E4F-E1E2D755756B}.Release|iPhone.Build.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|ARM.ActiveCfg = Debug|ARM + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|ARM.Build.0 = Debug|ARM + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|ARM.Deploy.0 = Debug|ARM + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|ARM64.Build.0 = Debug|ARM64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|iPhone.Build.0 = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|iPhone.Deploy.0 = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|iPhoneSimulator.Deploy.0 = Debug|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|x64.ActiveCfg = Debug|x64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|x64.Build.0 = Debug|x64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|x64.Deploy.0 = Debug|x64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|x86.ActiveCfg = Debug|x86 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|x86.Build.0 = Debug|x86 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Debug|x86.Deploy.0 = Debug|x86 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|Any CPU.Build.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|Any CPU.Deploy.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|ARM.ActiveCfg = Release|ARM + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|ARM.Build.0 = Release|ARM + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|ARM.Deploy.0 = Release|ARM + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|ARM64.ActiveCfg = Release|ARM64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|ARM64.Build.0 = Release|ARM64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|ARM64.Deploy.0 = Release|ARM64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|iPhone.ActiveCfg = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|iPhone.Build.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|iPhone.Deploy.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|iPhoneSimulator.Deploy.0 = Release|Any CPU + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|x64.ActiveCfg = Release|x64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|x64.Build.0 = Release|x64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|x64.Deploy.0 = Release|x64 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|x86.ActiveCfg = Release|x86 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|x86.Build.0 = Release|x86 + {2E5AD405-A55D-45EE-B125-B236AB5D4FCE}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 62d170c2cdf51ae6eaa36c76901535314bf53f3f Mon Sep 17 00:00:00 2001 From: Maksym Katsydan Date: Sat, 13 Nov 2021 21:55:01 -0500 Subject: [PATCH 2/3] Update Avalonia --- .../XamlControlsGallery.NetCore.csproj | 4 ++-- XamlControlsGallery/XamlControlsGallery.csproj | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj b/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj index f3407a8..74ebf45 100644 --- a/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj +++ b/XamlControlsGallery.NetCore/XamlControlsGallery.NetCore.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/XamlControlsGallery/XamlControlsGallery.csproj b/XamlControlsGallery/XamlControlsGallery.csproj index 2693788..012bb7f 100644 --- a/XamlControlsGallery/XamlControlsGallery.csproj +++ b/XamlControlsGallery/XamlControlsGallery.csproj @@ -19,9 +19,9 @@ - - - + + + From 99206f40e4dda3cd494010aed26301cebb31c428 Mon Sep 17 00:00:00 2001 From: Maksym Katsydan Date: Sat, 13 Nov 2021 22:04:17 -0500 Subject: [PATCH 3/3] Remove empty WAPPROJ --- WindowsStorePackage/WindowsStorePackage.wapproj | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 WindowsStorePackage/WindowsStorePackage.wapproj diff --git a/WindowsStorePackage/WindowsStorePackage.wapproj b/WindowsStorePackage/WindowsStorePackage.wapproj deleted file mode 100644 index 88a5509..0000000 --- a/WindowsStorePackage/WindowsStorePackage.wapproj +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file