Updated to use NuGet package instead of some file templates

MatisseHack · Feb 7, 2017 · 4caaae8 · 4caaae8
1 parent 1f6f96a
commit 4caaae8
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 186 deletions.
diff --git a/UITestPOPAddin/FileTemplates/PageFileTemplate.cs b/UITestPOPAddin/FileTemplates/PageFileTemplate.cs
@@ -8,8 +8,13 @@ namespace ${Namespace}
 {
     public class ${Name} : BasePage
     {
+        protected override PlatformQuery Trait => new PlatformQuery
+        {
+            Android = null,
+            iOS = null
+        };
+
         public ${Name}()
-            : base(null, null)
         {
             if (OnAndroid)
             {

diff --git a/UITestPOPAddin/FileTemplates/TestFileTemplate.cs b/UITestPOPAddin/FileTemplates/TestFileTemplate.cs
@@ -4,7 +4,7 @@
 
 namespace ${Namespace}
 {
-    public class ${Name} : AbstractSetup
+    public class ${Name} : BaseTestFixture
     {
         public ${Name}(Platform platform)
             : base(platform)

diff --git a/UITestPOPAddin/ProjectTemplates/AbstractSetupTemplate.cs b/UITestPOPAddin/ProjectTemplates/AbstractSetupTemplate.cs
diff --git a/UITestPOPAddin/ProjectTemplates/AppInitializerTemplate.cs b/UITestPOPAddin/ProjectTemplates/AppInitializerTemplate.cs
diff --git a/UITestPOPAddin/ProjectTemplates/BasePageTemplate.cs b/UITestPOPAddin/ProjectTemplates/BasePageTemplate.cs
diff --git a/UITestPOPAddin/ProjectTemplates/FirstPageTemplate.cs b/UITestPOPAddin/ProjectTemplates/FirstPageTemplate.cs
@@ -8,8 +8,13 @@ namespace ${Namespace}
 {
     public class FirstPage : BasePage
     {
+        protected override PlatformQuery Trait => new PlatformQuery
+        {
+            Android = null,
+            iOS = null
+        };
+
         public FirstPage()
-            : base(null, null)
         {
             if (OnAndroid)
             {

diff --git a/UITestPOPAddin/ProjectTemplates/PageObjectUITestApp.cs.xpt.xml b/UITestPOPAddin/ProjectTemplates/PageObjectUITestApp.cs.xpt.xml
@@ -36,17 +36,11 @@
 				<Package
 					ID="Xamarin.UITest"
 					Version="2.0.0" />
+				<Package
+					ID="Xamarin.UITest.POP"
+					Version="1.0.0" />
 			</Packages>
 			<Files>
-				<File
-					name="AbstractSetup.cs"
-					src="AbstractSetupTemplate.cs" />
-				<File
-					name="AppInitializer.cs"
-					src="AppInitializerTemplate.cs" />
-				<File
-					name="BasePage.cs"
-					src="BasePageTemplate.cs" />
 				<Directory
 					name="Pages">
 					<File

diff --git a/UITestPOPAddin/ProjectTemplates/TestsTemplate.cs b/UITestPOPAddin/ProjectTemplates/TestsTemplate.cs
@@ -4,7 +4,7 @@
 
 namespace ${Namespace}
 {
-    public class Tests : AbstractSetup
+    public class Tests : BaseTestFixture
     {
         public Tests(Platform platform)
             : base(platform)

diff --git a/UITestPOPAddin/Properties/AddinInfo.cs b/UITestPOPAddin/Properties/AddinInfo.cs
@@ -5,7 +5,7 @@
 [assembly: Addin(
     "UITestPOPAddin",
     Namespace = "UITestPOPAddin",
-    Version = "0.1.0"
+    Version = "1.0.0"
 )]
 
 [assembly: AddinName("UITest Page Object Add-In")]

diff --git a/UITestPOPAddin/UITestPOPAddin.csproj b/UITestPOPAddin/UITestPOPAddin.csproj
@@ -45,9 +45,6 @@
     <AddinFile Include="FileTemplates\PageFileTemplate.cs" />
     <AddinFile Include="FileTemplates\TestFileTemplate.cs" />
     <AddinFile Include="CodeTemplates\PageObjectCodeTemplates.xml" />
-    <AddinFile Include="ProjectTemplates\BasePageTemplate.cs" />
-    <AddinFile Include="ProjectTemplates\AppInitializerTemplate.cs" />
-    <AddinFile Include="ProjectTemplates\AbstractSetupTemplate.cs" />
     <AddinFile Include="ProjectTemplates\TestsTemplate.cs" />
     <AddinFile Include="ProjectTemplates\FirstPageTemplate.cs" />
   </ItemGroup>

diff --git a/fake.fsx b/fake.fsx
@@ -7,7 +7,7 @@ let releaseDir = currentDirectory + "/release/"
 let projects = [currentDirectory + "/UITestPOPAddin/UITestPOPAddin.csproj"]
 
 Target "Clean" (fun _ ->
-    CleanDirs [buildDir; releaseDir]
+    CleanDirs [buildDir]
 )
 
 Target "Build" (fun _ ->

diff --git a/release/UITestPOPAddin.UITestPOPAddin_1.0.0.mpack b/release/UITestPOPAddin.UITestPOPAddin_1.0.0.mpack
diff --git a/release/index.html b/release/index.html
@@ -3,5 +3,6 @@ <h1>Add-in Repository</h1>
 <p>This is a list of add-ins available in this repository.</p>
 <table border=1><thead><tr><th>Add-in</th><th>Version</th><th>Description</th></tr></thead>
 <tr><td>UITest Page Object Add-In</td><td>0.1.0</td><td>A Xamarin Studio add-in to facilitate using the page object pattern with UITest</td></tr>
+<tr><td>UITest Page Object Add-In</td><td>1.0.0</td><td>A Xamarin Studio add-in to facilitate using the page object pattern with UITest</td></tr>
 </table>
 </body></html>
diff --git a/release/main.mrep b/release/main.mrep
@@ -2,6 +2,6 @@
 <Repository xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Repository>
     <Url>root.mrep</Url>
-    <LastModified>2016-11-12T02:32:23-08:00</LastModified>
+    <LastModified>2017-02-06T16:54:41-08:00</LastModified>
   </Repository>
 </Repository>
diff --git a/release/root.mrep b/release/root.mrep
@@ -29,4 +29,24 @@
       </Properties>
     </Addin>
   </Addin>
+  <Addin>
+    <Url>UITestPOPAddin.UITestPOPAddin_1.0.0.mpack</Url>
+    <Addin>
+      <Id>UITestPOPAddin</Id>
+      <Namespace>UITestPOPAddin</Namespace>
+      <Name>UITest Page Object Add-In</Name>
+      <Version>1.0.0</Version>
+      <BaseVersion />
+      <Author>Matisse Hack</Author>
+      <Copyright />
+      <Url />
+      <Description>A Xamarin Studio add-in to facilitate using the page object pattern with UITest</Description>
+      <Category>IDE extensions</Category>
+      <Dependencies />
+      <OptionalDependencies />
+      <Properties>
+        <Property name="DownloadSize">5987</Property>
+      </Properties>
+    </Addin>
+  </Addin>
 </Repository>