dansiegel · dansiegel · Sep 28, 2020 · Sep 15, 2020 · Sep 16, 2020 · Sep 16, 2020
diff --git a/.editorconfig b/.editorconfig
@@ -31,6 +31,10 @@ indent_size = 2
 [*.xml]
 indent_size = 2
 
+# XAML Files
+[*.xaml]
+indent_size = 2
+
 # Dotnet code style settings:
 [*.{cs,vb}]
 # Sort using and Import directives with System.* appearing first

diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,6 @@ TestResults/
 .DS_Store
 Thumbs.db
 
-**/Images/**/Thumbs.db
+**/Images/**/Thumbs.db
+
+AppPackages/
diff --git a/Dependencies.props b/Dependencies.props
diff --git a/Directory.build.props b/Directory.build.props
@@ -5,22 +5,20 @@
     <Copyright>© Dan Siegel</Copyright>
     <PackageIconUrl>https://raw.githubusercontent.com/dansiegel/Mobile.BuildTools/master/logo/icon.png</PackageIconUrl>
     <PackageIcon>icon.png</PackageIcon>
-    <DevelopmentDependency>true</DevelopmentDependency>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReleaseNotes>https://github.com/dansiegel/Mobile.BuildTools/releases</PackageReleaseNotes>
     <PackageProjectUrl>https://mobilebuildtools.com</PackageProjectUrl>
     <LocalArtifactStagingDirectory>$([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'Artifacts'))</LocalArtifactStagingDirectory>
     <PackageOutputPath Condition=" '$(BUILD_ARTIFACTSTAGINGDIRECTORY)' != '' ">$([System.IO.Path]::Combine('$(BUILD_ARTIFACTSTAGINGDIRECTORY)', 'Artifacts'))</PackageOutputPath>
     <PackageOutputPath Condition=" '$(BUILD_ARTIFACTSTAGINGDIRECTORY)' == '' ">$(LocalArtifactStagingDirectory)</PackageOutputPath>
-    <VersionPrefix>2.0.0</VersionPrefix>
-    <VersionPrefix Condition=" '$(BUILD_BUILDNUMBER)' != '' ">$(VersionPrefix).$(BUILD_BUILDNUMBER)</VersionPrefix>
-    <VersionSuffix>ci</VersionSuffix>
-    <VersionSuffix Condition=" '$(IS_PREVIEW)' == 'true' ">pre</VersionSuffix>
-    <VersionSuffix Condition=" '$(IS_RELEASE)' == 'true' "></VersionSuffix>
-    <LangVersion Condition=" '$(OS)' == 'Windows_NT' ">8.0</LangVersion>
     <IsPackable>false</IsPackable>
     <IncludeSymbols>True</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <IncludeSource>True</IncludeSource>
+    <LangVersion>latest</LangVersion>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/dansiegel/Mobile.BuildTools.git</RepositoryUrl>
+    <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
 
   <!-- CI Helper -->
@@ -30,10 +28,6 @@
     <ContinuousIntegrationBuild>$(CI)</ContinuousIntegrationBuild>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <MicrosoftBuildNuGetVersion>16.0.461</MicrosoftBuildNuGetVersion>
-  </PropertyGroup>
-
   <ItemGroup Condition="$(IsPackable)">
     <None Include="$(MSBuildThisFileDirectory)logo\icon.png" Pack="true" PackagePath="\icon.png" />
   </ItemGroup>

diff --git a/Directory.build.targets b/Directory.build.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Sdk Name="Microsoft.Build.CentralPackageVersions" Version="2.0.79" />
 
   <PropertyGroup>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
@@ -7,6 +8,7 @@
   <Target Name="DeleteCachedPackage" Condition="'$(CI)' != 'true'" BeforeTargets="Pack">
     <ItemGroup>
       <ToDelete Include="$(PackageOutputPath)\$(PackageId).$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)*.*" />
+      <ToDelete Include="$(LocalArtifactStagingDirectory)\$(PackageId).$(GitBaseVersionMajor).$(GitBaseVersionMinor).*" />
     </ItemGroup>
     <Delete Files="@(ToDelete)" />
     <Exec Command='rd "$(NuGetPackageRoot)$(PackageId.ToLowerInvariant())" /q /s'

diff --git a/E2E/CI.props b/E2E/CI.props
@@ -0,0 +1,7 @@
+<Project>
+  <Import Project="../Directory.Build.props" />
+  <ItemGroup>
+    <PackageReference Include="Mobile.BuildTools" VersionOverride="GeneratedPackageVersion" PrivateAssets="all" />
+    <PackageReference Include="Mobile.BuildTools.Configuration" VersionOverride="GeneratedPackageVersion" />
+  </ItemGroup>
+</Project>
diff --git a/E2E/Directory.Build.props b/E2E/Directory.Build.props
@@ -0,0 +1,23 @@
+<Project>
+
+  <Import Project="../Directory.Build.props" />
+
+  <PropertyGroup Condition=" '$(PIPELINE_WORKSPACE)' != '' ">
+    <CIArtifactsDirectory>$([System.IO.Path]::Combine('$(PIPELINE_WORKSPACE)', 'Artifacts'))</CIArtifactsDirectory>
+    <GeneratedLocalPackage>$([System.IO.Directory]::GetFiles('$(CIArtifactsDirectory)', 'Mobile.BuildTools.2.*.nupkg')[0])</GeneratedLocalPackage>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(PIPELINE_WORKSPACE)' == '' ">
+    <GeneratedLocalPackage>$([System.IO.Directory]::GetFiles('$(LocalArtifactStagingDirectory)', 'Mobile.BuildTools.2.*.nupkg')[0])</GeneratedLocalPackage>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <GenerateLocalPackageFileName>$([System.IO.Path]::GetFileNameWithoutExtension('$(GeneratedLocalPackage)'))</GenerateLocalPackageFileName>
+    <GeneratedPackageVersion>$(GenerateLocalPackageFileName.Replace('Mobile.BuildTools.', ''))</GeneratedPackageVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Mobile.BuildTools" VersionOverride="$(GeneratedPackageVersion)" PrivateAssets="all" />
+    <PackageReference Include="Mobile.BuildTools.Configuration" VersionOverride="$(GeneratedPackageVersion)" />
+  </ItemGroup>
+
+</Project>
diff --git a/E2E/Directory.build.props b/E2E/Directory.build.props
diff --git a/E2E/E2E.Core/E2E.Core.csproj b/E2E/E2E.Core/E2E.Core.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)" />
+    <PackageReference Include="Xamarin.Forms" />
   </ItemGroup>
 
 </Project>
diff --git a/E2E/E2E.Tests/E2E.Tests.csproj b/E2E/E2E.Tests/E2E.Tests.csproj
@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <MobileBuildToolsDebug>true</MobileBuildToolsDebug>
   </PropertyGroup>
 
   <!-- <None Include="SampleManifest.json" CopyToOutput> -->
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-    <PackageReference Include="Xamarin.Forms.Mocks" Version="3.5.0.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Xamarin.Forms" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
+    <PackageReference Include="Xamarin.Forms.Mocks" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/E2E/E2EApp/E2EApp.Android/E2EApp.Android.csproj b/E2E/E2EApp/E2EApp.Android/E2EApp.Android.csproj
@@ -49,12 +49,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Android.Support.v7.CardView" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" Version="28.0.0.3" />
-    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)" />
+    <PackageReference Include="Xamarin.Android.Support.Design" />
+    <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" />
+    <PackageReference Include="Xamarin.Android.Support.v4" />
+    <PackageReference Include="Xamarin.Android.Support.v7.CardView" />
+    <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" />
+    <PackageReference Include="Xamarin.Forms" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/E2E/E2EApp/E2EApp.Android/Properties/AssemblyInfo.cs b/E2E/E2EApp/E2EApp.Android/Properties/AssemblyInfo.cs
@@ -3,32 +3,19 @@
 using System.Runtime.InteropServices;
 using Android.App;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("E2EApp.Android")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("E2EApp.Android")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright © Dan Siegel 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
 // Add some common permissions, these can be removed if not needed
 [assembly: UsesPermission(Android.Manifest.Permission.Internet)]
 [assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/E2E/E2EApp/E2EApp.UITests/E2EApp.UITests.csproj b/E2E/E2EApp/E2EApp.UITests/E2EApp.UITests.csproj
@@ -28,8 +28,8 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="Xamarin.UITest" Version="3.0.3 " />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="Xamarin.UITest" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\E2EApp.iOS\E2EApp.iOS.csproj">

diff --git a/E2E/E2EApp/E2EApp.UITests/Tests.cs b/E2E/E2EApp/E2EApp.UITests/Tests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using NUnit.Framework;
@@ -51,12 +52,8 @@ public void ClientVersionIsUpdated()
 
         private string GetBuildNumber()
         {
-            if(File.Exists("buildnumber.txt"))
-            {
-                return File.ReadAllText("buildnumber.txt");
-            }
-
-            return string.Empty;
+            var assembly = GetType().Assembly;
+            return FileVersionInfo.GetVersionInfo(assembly.Location).FileVersion;
         }
     }
 }
diff --git a/E2E/E2EApp/E2EApp.UITests/buildnumber.txt b/E2E/E2EApp/E2EApp.UITests/buildnumber.txt
diff --git a/E2E/E2EApp/E2EApp.iOS/E2EApp.iOS.csproj b/E2E/E2EApp/E2EApp.iOS/E2EApp.iOS.csproj
@@ -114,8 +114,8 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.TestCloud.Agent" Version="0.21.9" />
-    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)" />
+    <PackageReference Include="Xamarin.TestCloud.Agent" />
+    <PackageReference Include="Xamarin.Forms" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <ItemGroup>

diff --git a/E2E/E2EApp/E2EApp.iOS/Properties/AssemblyInfo.cs b/E2E/E2EApp/E2EApp.iOS/Properties/AssemblyInfo.cs
@@ -2,35 +2,22 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("E2EApp.iOS")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("E2EApp.iOS")]
-[assembly: AssemblyCopyright("Copyright ©  2014")]
+[assembly: AssemblyCopyright("Copyright © Dan Siegel 2020")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("72bdc44f-c588-44f3-b6df-9aace7daafdd")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/E2E/E2EApp/E2EApp/E2EApp.csproj b/E2E/E2EApp/E2EApp/E2EApp.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Xamarin.Essentials" Version="$(XamarinEssentialsVersion)" />
-    <PackageReference Include="Xamarin.Forms" Version="$(XamarinFormsVersion)" />
+    <PackageReference Include="Xamarin.Essentials" />
+    <PackageReference Include="Xamarin.Forms" />
   </ItemGroup>
 
 </Project>
diff --git a/Mobile.BuildTools.sln b/Mobile.BuildTools.sln
@@ -1,11 +1,10 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.202
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.BuildTools", "src\Mobile.BuildTools\Mobile.BuildTools.csproj", "{ECB330A6-90E5-4EF2-8889-86DE2AC0723E}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.BuildTools.CLI", "src\Mobile.BuildTools.CLI\Mobile.BuildTools.CLI.csproj", "{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.BuildTools.Configuration", "src\Mobile.BuildTools.Configuration\Mobile.BuildTools.Configuration.csproj", "{25063D4D-2ECC-4B75-98D0-F7B6BAD9D1F7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.BuildTools.Tests", "tests\Mobile.BuildTools.Tests\Mobile.BuildTools.Tests.csproj", "{22808734-C8D3-431E-AA9A-92432DE4EB6A}"
@@ -26,9 +25,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{677B710E-6C18-47C0-93B2-A3899370BF5A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mobile.BuildTools.SchemaGenerator", "tools\Mobile.BuildTools.SchemaGenerator\Mobile.BuildTools.SchemaGenerator.csproj", "{B102C625-C640-4E90-B634-CC730140CB7C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.BuildTools.SchemaGenerator", "tools\Mobile.BuildTools.SchemaGenerator\Mobile.BuildTools.SchemaGenerator.csproj", "{B102C625-C640-4E90-B634-CC730140CB7C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mobile.BuildTools.Reference", "src\Mobile.BuildTools.Reference\Mobile.BuildTools.Reference.csproj", "{20FB88AB-5FE0-41DC-97B7-4C8772A0D059}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mobile.BuildTools.Reference", "src\Mobile.BuildTools.Reference\Mobile.BuildTools.Reference.csproj", "{20FB88AB-5FE0-41DC-97B7-4C8772A0D059}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,18 +51,6 @@ Global
 		{ECB330A6-90E5-4EF2-8889-86DE2AC0723E}.Release|x64.Build.0 = Release|Any CPU
 		{ECB330A6-90E5-4EF2-8889-86DE2AC0723E}.Release|x86.ActiveCfg = Release|Any CPU
 		{ECB330A6-90E5-4EF2-8889-86DE2AC0723E}.Release|x86.Build.0 = Release|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Debug|x64.Build.0 = Debug|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Debug|x86.Build.0 = Debug|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Release|x64.ActiveCfg = Release|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Release|x64.Build.0 = Release|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Release|x86.ActiveCfg = Release|Any CPU
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF}.Release|x86.Build.0 = Release|Any CPU
 		{25063D4D-2ECC-4B75-98D0-F7B6BAD9D1F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{25063D4D-2ECC-4B75-98D0-F7B6BAD9D1F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{25063D4D-2ECC-4B75-98D0-F7B6BAD9D1F7}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -130,7 +117,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{ECB330A6-90E5-4EF2-8889-86DE2AC0723E} = {C7456F1C-2B86-4C40-A228-72209A7355A0}
-		{E8B73A93-DB45-42B7-8902-0E0AE945D7BF} = {C7456F1C-2B86-4C40-A228-72209A7355A0}
 		{25063D4D-2ECC-4B75-98D0-F7B6BAD9D1F7} = {C7456F1C-2B86-4C40-A228-72209A7355A0}
 		{22808734-C8D3-431E-AA9A-92432DE4EB6A} = {2510D213-21AF-4B25-888D-E63163356A4F}
 		{82EF42A8-49A3-4086-A045-5E2C2F094C04} = {2510D213-21AF-4B25-888D-E63163356A4F}