Update sample apps to use XSF single assembly (#164)

diff --git a/src/XSF.sln b/src/XSF.sln
old mode 100644 (file)
new mode 100755 (executable)
index b32c6ed..80160ed
--- a/src/XSF.sln
+++ b/src/XSF.sln
@@ -32,6 +32,31 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XStopWatch", "..\test\XStop
                {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}
        EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alarm", "..\test\Alarm\Alarm\Alarm.csproj", "{8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}"
+       ProjectSection(ProjectDependencies) = postProject
+               {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}
+       EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Calculator", "..\test\Calculator\Calculator\Calculator.csproj", "{D9BDB76D-0717-4BC7-BF05-2090CA24FB52}"
+       ProjectSection(ProjectDependencies) = postProject
+               {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}
+       EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HeartRateMonitor", "..\test\HeartRateMonitor\HeartRateMonitor.csproj", "{48667162-B899-4BDC-A721-A8FA8D2FC1E3}"
+       ProjectSection(ProjectDependencies) = postProject
+               {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}
+       EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceMemo", "..\test\Voicememo2020\VoiceMemo\VoiceMemo.csproj", "{CE718C63-1D7D-44B2-93D9-D0E9F42E5901}"
+       ProjectSection(ProjectDependencies) = postProject
+               {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}
+       EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Weather", "..\test\Weather\Weather\Weather.csproj", "{BF967F5A-5214-451E-8004-4A6C1007026F}"
+       ProjectSection(ProjectDependencies) = postProject
+               {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0} = {54A229B4-71F1-41B8-9D26-8B5D34A2E2A0}
+       EndProjectSection
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
@@ -54,15 +79,40 @@ Global
                {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {1D2AFB0D-F074-466C-8153-DB8F5E07B093}.Release|Any CPU.Build.0 = Release|Any CPU
+               {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52}.Release|Any CPU.Build.0 = Release|Any CPU
+               {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {D9BDB76D-0717-4BC7-BF05-2090CA24FB52}.Release|Any CPU.Build.0 = Release|Any CPU
+               {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {48667162-B899-4BDC-A721-A8FA8D2FC1E3}.Release|Any CPU.Build.0 = Release|Any CPU
+               {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {CE718C63-1D7D-44B2-93D9-D0E9F42E5901}.Release|Any CPU.Build.0 = Release|Any CPU
+               {BF967F5A-5214-451E-8004-4A6C1007026F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {BF967F5A-5214-451E-8004-4A6C1007026F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {BF967F5A-5214-451E-8004-4A6C1007026F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+               {BF967F5A-5214-451E-8004-4A6C1007026F}.Release|Any CPU.Build.0 = Release|Any CPU
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE
        EndGlobalSection
        GlobalSection(NestedProjects) = preSolution
                {1D2AFB0D-F074-466C-8153-DB8F5E07B093} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B}
+               {8D00BBE5-726B-44A0-9A6E-CBE43EB1FD52} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B}
+               {D9BDB76D-0717-4BC7-BF05-2090CA24FB52} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B}
+               {48667162-B899-4BDC-A721-A8FA8D2FC1E3} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B}
+               {CE718C63-1D7D-44B2-93D9-D0E9F42E5901} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B}
+               {BF967F5A-5214-451E-8004-4A6C1007026F} = {2AB5E7BD-4759-4031-967C-79BDF7746D8B}
        EndGlobalSection
        GlobalSection(ExtensibilityGlobals) = postSolution
-               SolutionGuid = {38E1EEEE-8DAE-418F-8F52-AF552950601F}
                        SolutionGuid = {2671CF0D-9604-4B78-BE93-3E5C392B1065}
+               SolutionGuid = {38E1EEEE-8DAE-418F-8F52-AF552950601F}
        EndGlobalSection
 EndGlobal

diff --git a/test/Alarm/Alarm/Alarm.csproj b/test/Alarm/Alarm/Alarm.csproj
old mode 100644 (file)
new mode 100755 (executable)
index 9f4a15a..3c373c0
--- a/test/Alarm/Alarm/Alarm.csproj
+++ b/test/Alarm/Alarm/Alarm.csproj
@@ -13,85 +13,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="lib\" />
     <Folder Include="res\" />
   </ItemGroup>
 
   <ItemGroup>
-      <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\XSF.CircularUI.Forms.Renderer.csproj" />
-      <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms\XSF.CircularUI.Forms.csproj" />
-      <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Core\XSF.Core.csproj" />
-      <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\XSF.Platform.Tizen.csproj" />
-      <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform\XSF.Platform.csproj" />
-      <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Xaml\XSF.Xaml.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Resx\AppResource - Copy.Designer.cs">
-      <DependentUpon>AppResource - Copy.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Resx\AppResource - Copy.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>AppResource.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Resx\AppResources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>AppResources.resx</DependentUpon>
-    </Compile>
-    <Compile Update="Views\AlarmAlertPage.xaml.cs">
-      <DependentUpon>AlarmAlertPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="App.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resx\AppResources.ko.resx">
-      <LastGenOutput>AppResource.Designer.cs</LastGenOutput>
-      <Generator>PublicResXFileCodeGenerator</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Resx\AppResources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Views\AlarmEditPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Views\AlarmAlertPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Views\CirclePageEx.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Views\MainPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\AlarmAlertPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\AlarmEditPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\CirclePageEx.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\SavePopupPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
+    <ProjectReference Include="..\..\..\src\XSF\XSF.csproj" />
   </ItemGroup>
 
 </Project>

diff --git a/test/Alarm/Alarm/Views/AlarmAlertPage.xaml b/test/Alarm/Alarm/Views/AlarmAlertPage.xaml
old mode 100644 (file)
new mode 100755 (executable)
index c157f23..d4341d1
--- a/test/Alarm/Alarm/Views/AlarmAlertPage.xaml
+++ b/test/Alarm/Alarm/Views/AlarmAlertPage.xaml
@@ -6,7 +6,7 @@
        xmlns:converters="clr-namespace:Alarm.Converters"
        xmlns:resx="clr-namespace:Alarm.Resx"
        xmlns:views="clr-namespace:Alarm.Views"
-       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms">
+       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF">
        <ContentPage.Resources>
                <ResourceDictionary>
                        <converters:ScheduledDateTimeToTextConverter x:Key="TimeConverter" />

diff --git a/test/Alarm/Alarm/Views/AlarmEditPage.xaml b/test/Alarm/Alarm/Views/AlarmEditPage.xaml
old mode 100644 (file)
new mode 100755 (executable)
index 38858ea..f47cb85
--- a/test/Alarm/Alarm/Views/AlarmEditPage.xaml
+++ b/test/Alarm/Alarm/Views/AlarmEditPage.xaml
@@ -4,7 +4,7 @@
        xmlns="http://xamarin.com/schemas/2014/forms"
        xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
        xmlns:views="clr-namespace:Alarm.Views"
-       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
        RotaryFocusObject="{x:Reference TimeSelector}">
        <w:CirclePage.Content>
                <StackLayout

diff --git a/test/Alarm/Alarm/Views/CirclePageEx.xaml b/test/Alarm/Alarm/Views/CirclePageEx.xaml
old mode 100644 (file)
new mode 100755 (executable)
index 133b629..b0f6cbc
--- a/test/Alarm/Alarm/Views/CirclePageEx.xaml
+++ b/test/Alarm/Alarm/Views/CirclePageEx.xaml
@@ -3,4 +3,4 @@
        x:Class="Alarm.Views.CirclePageEx"
        xmlns="http://xamarin.com/schemas/2014/forms"
        xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms" />
\ No newline at end of file
+       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF" />
\ No newline at end of file

diff --git a/test/Alarm/Alarm/Views/MainPage.xaml b/test/Alarm/Alarm/Views/MainPage.xaml
old mode 100644 (file)
new mode 100755 (executable)
index a4c01bb..a6d118c
--- a/test/Alarm/Alarm/Views/MainPage.xaml
+++ b/test/Alarm/Alarm/Views/MainPage.xaml
@@ -7,7 +7,7 @@
        xmlns:converters="clr-namespace:Alarm.Converters"
        xmlns:resx="clr-namespace:Alarm.Resx"
        xmlns:views="clr-namespace:Alarm.Views"
-       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+       xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
        Title="MainPage"
        RotaryFocusObject="{x:Reference AlarmList}">
        <ContentPage.Resources>

diff --git a/test/Calculator/Calculator/Calculator.csproj b/test/Calculator/Calculator/Calculator.csproj
old mode 100644 (file)
new mode 100755 (executable)
index 06c865e..bc169f5
--- a/test/Calculator/Calculator/Calculator.csproj
+++ b/test/Calculator/Calculator/Calculator.csproj
@@ -13,27 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\XSF.CircularUI.Forms.Renderer.csproj" />
-    <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms\XSF.CircularUI.Forms.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Core\XSF.Core.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\XSF.Platform.Tizen.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform\XSF.Platform.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Xaml\XSF.Xaml.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Views\CalculatorMainPage.xaml.cs">
-      <DependentUpon>CalculatorMainPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Controls\ImageButton.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="Views\CalculatorMainPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
+    <ProjectReference Include="..\..\..\src\XSF\XSF.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/HeartRateMonitor/HeartRateMonitor.csproj b/test/HeartRateMonitor/HeartRateMonitor.csproj
old mode 100644 (file)
new mode 100755 (executable)
index 08c1bc8..d3af257
--- a/test/HeartRateMonitor/HeartRateMonitor.csproj
+++ b/test/HeartRateMonitor/HeartRateMonitor.csproj
@@ -13,19 +13,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Folder Include="lib\" />
     <Folder Include="Controls\" />
     <Folder Include="ViewModels\" />
     <Folder Include="res\" />
   </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\XSF.CircularUI.Forms.Renderer.csproj" />
-        <ProjectReference Include="..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms\XSF.CircularUI.Forms.csproj" />
-        <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Core\XSF.Core.csproj" />
-        <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\XSF.Platform.Tizen.csproj" />
-        <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Platform\XSF.Platform.csproj" />
-        <ProjectReference Include="..\..\Xamarin.Forms\Xamarin.Forms.Xaml\XSF.Xaml.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\XSF\XSF.csproj" />
+  </ItemGroup>
 
 </Project>

diff --git a/test/HeartRateMonitor/Views/MeasurementPage.xaml b/test/HeartRateMonitor/Views/MeasurementPage.xaml
old mode 100644 (file)
new mode 100755 (executable)
index 43b2f16..a870c93
--- a/test/HeartRateMonitor/Views/MeasurementPage.xaml
+++ b/test/HeartRateMonitor/Views/MeasurementPage.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<forms:CirclePage xmlns:forms="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+<forms:CirclePage xmlns:forms="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
                   xmlns="http://xamarin.com/schemas/2014/forms"
                   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                   xmlns:controls="clr-namespace:HeartRateMonitor.Controls"

diff --git a/test/HeartRateMonitor/Views/SettingsPage.xaml b/test/HeartRateMonitor/Views/SettingsPage.xaml
old mode 100644 (file)
new mode 100755 (executable)
index a3efbec..f99fb9e
--- a/test/HeartRateMonitor/Views/SettingsPage.xaml
+++ b/test/HeartRateMonitor/Views/SettingsPage.xaml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<forms:CirclePage xmlns:forms="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+<forms:CirclePage xmlns:forms="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
                   xmlns="http://xamarin.com/schemas/2014/forms"
                   xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                   x:Class="HeartRateMonitor.Views.SettingsPage"

diff --git a/test/Voicememo2020/VoiceMemo/Views/CancelPage.xaml b/test/Voicememo2020/VoiceMemo/Views/CancelPage.xaml
index a61bd66..b9d8d86 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/CancelPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/CancelPage.xaml
@@ -4,7 +4,7 @@
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     xmlns:resx="clr-namespace:VoiceMemo.Resx;"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms">
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF">
     <w:TwoButtonPage.FirstButton>
         <MenuItem Clicked="OnAbortCancelClicked" Icon="tw_ic_popup_btn_delete.png" />
     </w:TwoButtonPage.FirstButton>

diff --git a/test/Voicememo2020/VoiceMemo/Views/CirclePageEx.xaml b/test/Voicememo2020/VoiceMemo/Views/CirclePageEx.xaml
index 5cf0cf0..bc9f677 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/CirclePageEx.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/CirclePageEx.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <w:CirclePage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-            xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+            xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
             x:Class="VoiceMemo.Views.CirclePageEx">
 </w:CirclePage>
\ No newline at end of file

diff --git a/test/Voicememo2020/VoiceMemo/Views/DetailsPage.xaml b/test/Voicememo2020/VoiceMemo/Views/DetailsPage.xaml
index b64078d..4bf8915 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/DetailsPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/DetailsPage.xaml
@@ -6,7 +6,7 @@
     xmlns:converters="clr-namespace:VoiceMemo.Converters;"
     xmlns:view="clr-namespace:VoiceMemo.Views;"
     xmlns:vm="clr-namespace:VoiceMemo.ViewModels;"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
     RotaryFocusObject="{x:Reference ScrollTextView}"
     x:Name="Details">
     <ContentPage.Resources>

diff --git a/test/Voicememo2020/VoiceMemo/Views/LanguageSelectionPage.xaml b/test/Voicememo2020/VoiceMemo/Views/LanguageSelectionPage.xaml
index 7438e14..5d600c3 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/LanguageSelectionPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/LanguageSelectionPage.xaml
@@ -7,7 +7,7 @@
     xmlns:vms="clr-namespace:VoiceMemo.ViewModels;"
     xmlns:view="clr-namespace:VoiceMemo.Views;"
     xmlns:resx="clr-namespace:VoiceMemo.Resx;"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
     RotaryFocusObject="{x:Reference LangListView}">
     <ContentPage.Resources>
         <ResourceDictionary>

diff --git a/test/Voicememo2020/VoiceMemo/Views/MainPage.xaml b/test/Voicememo2020/VoiceMemo/Views/MainPage.xaml
index 8b26c2d..837c751 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/MainPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/MainPage.xaml
@@ -5,7 +5,7 @@
                     xmlns:converters="clr-namespace:VoiceMemo.Converters;"
                     xmlns:views="clr-namespace:VoiceMemo.Views;"
                     xmlns:vm="clr-namespace:VoiceMemo.ViewModels;"
-                    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+                    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
                     xmlns:resx="clr-namespace:VoiceMemo.Resx;"
                     x:Name="StandBy"
                     Title="MainPage">

diff --git a/test/Voicememo2020/VoiceMemo/Views/PlayBackPage.xaml b/test/Voicememo2020/VoiceMemo/Views/PlayBackPage.xaml
index c9bedc9..2177143 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/PlayBackPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/PlayBackPage.xaml
@@ -6,7 +6,7 @@
     xmlns:converters="clr-namespace:VoiceMemo.Converters;"
     xmlns:views="clr-namespace:VoiceMemo.Views;"
     xmlns:vm="clr-namespace:VoiceMemo.ViewModels;"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms" >
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF" >
     <!--TODO: it is possible to cast CircleSlider to RotaryFocusable object. RotaryFocusTargetName="PlayProgress">-->
     <w:CirclePage.CircleSurfaceItems>
         <w:CircleProgressBarSurfaceItem x:Name="PlayProgress" Value="{Binding PlayingProcess}" />

diff --git a/test/Voicememo2020/VoiceMemo/Views/RecordListPage.xaml b/test/Voicememo2020/VoiceMemo/Views/RecordListPage.xaml
index 2401769..a18b56d 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/RecordListPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/RecordListPage.xaml
@@ -7,7 +7,7 @@
     xmlns:views="clr-namespace:VoiceMemo.Views;"
     xmlns:effect="clr-namespace:VoiceMemo.Effects;"
     xmlns:resx="clr-namespace:VoiceMemo.Resx;"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
     x:Name="myRecordListPage"
     RotaryFocusObject="{x:Reference DataListView}">
     <views:CirclePageEx.Resources>

diff --git a/test/Voicememo2020/VoiceMemo/Views/RecordingPage.xaml b/test/Voicememo2020/VoiceMemo/Views/RecordingPage.xaml
index cf8d7da..6e8b874 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/RecordingPage.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/RecordingPage.xaml
@@ -6,7 +6,7 @@
     xmlns:views="clr-namespace:VoiceMemo.Views;"
     xmlns:vm="clr-namespace:VoiceMemo.ViewModels;"
     xmlns:converter="clr-namespace:VoiceMemo.Converters"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
     Title="{Binding Title}">
     <views:CirclePageEx.Resources>
         <ResourceDictionary>

diff --git a/test/Voicememo2020/VoiceMemo/Views/SttLanguageViewCell.xaml b/test/Voicememo2020/VoiceMemo/Views/SttLanguageViewCell.xaml
index 7f5a03b..0aa6b26 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/Views/SttLanguageViewCell.xaml
+++ b/test/Voicememo2020/VoiceMemo/Views/SttLanguageViewCell.xaml
@@ -3,7 +3,7 @@
     x:Class="VoiceMemo.Views.SttLanguageViewCell"
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms">
+    xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF">
     <ViewCell.View>
         <RelativeLayout HeightRequest="130" WidthRequest="360">
             <Label

diff --git a/test/Voicememo2020/VoiceMemo/VoiceMemo.csproj b/test/Voicememo2020/VoiceMemo/VoiceMemo.csproj
index 7b27b2f..0d79931 100755 (executable)
--- a/test/Voicememo2020/VoiceMemo/VoiceMemo.csproj
+++ b/test/Voicememo2020/VoiceMemo/VoiceMemo.csproj
@@ -17,7 +17,6 @@
 
   <ItemGroup>
     <Folder Include="Effects\" />
-    <Folder Include="lib\" />
     <Folder Include="Resx\" />
     <Folder Include="res\2019_custom_button\" />
     <Folder Include="res\2019\" />
@@ -31,70 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\XSF.CircularUI.Forms.Renderer.csproj" />
-    <!--<ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms\XSF.CircularUI.Forms.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Core\XSF.Core.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\XSF.Platform.Tizen.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform\XSF.Platform.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Xaml\XSF.Xaml.csproj" />-->
+    <ProjectReference Include="..\..\..\src\XSF\XSF.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="ElmSharp">
-      <HintPath>lib\ElmSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="ElmSharp.Wearable">
-      <HintPath>lib\ElmSharp.Wearable.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Update="Views\NoRecordView.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\CancelPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\CirclePageEx.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\DetailsPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\LanguageSelectionPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\PlayBackPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\RecordingPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\RecordListPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-    <None Update="Views\SttLanguageViewCell.xaml">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-  </ItemGroup>
-
-  <!--<ItemGroup>
-    <EmbeddedResource Update="App.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-    <EmbeddedResource Update="MainPage.xaml">
-      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
-    </EmbeddedResource>
-  </ItemGroup>-->
-
 </Project>
 

diff --git a/test/Weather/Weather/Views/ApiErrorPage.xaml b/test/Weather/Weather/Views/ApiErrorPage.xaml
index 09fe601..50889b6 100755 (executable)
--- a/test/Weather/Weather/Views/ApiErrorPage.xaml
+++ b/test/Weather/Weather/Views/ApiErrorPage.xaml
@@ -7,7 +7,7 @@
              x:Class="Weather.Views.ApiErrorPage"
              NavigationPage.HasBackButton="False"        
              NavigationPage.HasNavigationBar="False"
-             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
              >
 
     <ContentPage.BindingContext>

diff --git a/test/Weather/Weather/Views/CurrentWeatherPage.xaml b/test/Weather/Weather/Views/CurrentWeatherPage.xaml
index 7638034..6e4761d 100755 (executable)
--- a/test/Weather/Weather/Views/CurrentWeatherPage.xaml
+++ b/test/Weather/Weather/Views/CurrentWeatherPage.xaml
@@ -8,7 +8,7 @@
              xmlns:location="clr-namespace:Weather.Models.Location;assembly=Weather"
              xmlns:controls="clr-namespace:Weather.Controls;assembly=Weather"
              xmlns:views="clr-namespace:Weather.Views;assembly=Weather"
-             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"            
+             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"            
              x:Class="Weather.Views.CurrentWeatherPage"
              x:Name="Root"
              NavigationPage.HasNavigationBar="False"

diff --git a/test/Weather/Weather/Views/ForecastPage.xaml b/test/Weather/Weather/Views/ForecastPage.xaml
index 0f75bd9..ea169f4 100755 (executable)
--- a/test/Weather/Weather/Views/ForecastPage.xaml
+++ b/test/Weather/Weather/Views/ForecastPage.xaml
@@ -8,7 +8,7 @@
              xmlns:location="clr-namespace:Weather.Models.Location;assembly=Weather"
              xmlns:controls="clr-namespace:Weather.Controls;assembly=Weather"
              xmlns:views="clr-namespace:Weather.Views;assembly=Weather"
-             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"            
+             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"            
              x:Class="Weather.Views.ForecastPage"
              x:Name="ForecastCirclePage"
              NavigationPage.HasNavigationBar="False"

diff --git a/test/Weather/Weather/Views/MainPage.xaml b/test/Weather/Weather/Views/MainPage.xaml
index 4c6e9a5..05a16a7 100755 (executable)
--- a/test/Weather/Weather/Views/MainPage.xaml
+++ b/test/Weather/Weather/Views/MainPage.xaml
@@ -4,7 +4,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              xmlns:viewModels="clr-namespace:Weather.ViewModels;assembly=Weather"
              xmlns:behaviors="clr-namespace:Weather.Behaviors;assembly=Weather"
-             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"            
+             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"            
              xmlns:views="clr-namespace:Weather.Views;assembly=Weather"
              x:Class="Weather.Views.MainPage"
              x:Name="Root"

diff --git a/test/Weather/Weather/Views/MissingKeyErrorPage.xaml b/test/Weather/Weather/Views/MissingKeyErrorPage.xaml
index 907e199..8129642 100755 (executable)
--- a/test/Weather/Weather/Views/MissingKeyErrorPage.xaml
+++ b/test/Weather/Weather/Views/MissingKeyErrorPage.xaml
@@ -2,7 +2,7 @@
 
 <w:CirclePage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF.CircularUI.Forms"
+             xmlns:w="clr-namespace:Tizen.Wearable.CircularUI.Forms;assembly=XSF"
              xmlns:viewModels="clr-namespace:Weather.ViewModels;assembly=Weather"
              x:Class="Weather.Views.MissingKeyErrorPage"
              NavigationPage.HasNavigationBar="False">

diff --git a/test/Weather/Weather/Weather.csproj b/test/Weather/Weather/Weather.csproj
index a0339f8..b4c33c7 100755 (executable)
--- a/test/Weather/Weather/Weather.csproj
+++ b/test/Weather/Weather/Weather.csproj
@@ -5,13 +5,7 @@
     <TargetFramework>tizen40</TargetFramework>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>portable</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>None</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
+    <ItemGroup>
     <None Remove="Data\city.list.json" />
     <None Remove="Data\country.list.json" />
   </ItemGroup>
@@ -25,10 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="lib\" />
     <Folder Include="Config\" />
     <Folder Include="Views\" />
-    <Folder Include="res\" />
   </ItemGroup>
 
   <ItemGroup>
@@ -36,12 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms.Renderer\XSF.CircularUI.Forms.Renderer.csproj" />
-    <!--<ProjectReference Include="..\..\..\Tizen.CircularUI\Tizen.Wearable.CircularUI.Forms\XSF.CircularUI.Forms.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Core\XSF.Core.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform.Tizen\XSF.Platform.Tizen.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Platform\XSF.Platform.csproj" />
-    <ProjectReference Include="..\..\..\Xamarin.Forms\Xamarin.Forms.Xaml\XSF.Xaml.csproj" />-->
+    <ProjectReference Include="..\..\..\src\XSF\XSF.csproj" />
   </ItemGroup>
 
 </Project>

diff --git a/test/XStopWatch/XStopWatch.csproj b/test/XStopWatch/XStopWatch.csproj
old mode 100644 (file)
new mode 100755 (executable)
index ac3e5af..140131a
--- a/test/XStopWatch/XStopWatch.csproj
+++ b/test/XStopWatch/XStopWatch.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Tizen.NET.Sdk/1.0.9">
+<Project Sdk="Tizen.NET.Sdk/1.0.8">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>