Merge branch 'master' into dev

ridomin · May 15, 2019 · 9ca0178 · 9ca0178
2 parents f0a4d88 + a68977f
commit 9ca0178
Show file tree

Hide file tree

Showing 16 changed files with 134 additions and 87 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>2.3.151</Version>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/README.md b/README.md
@@ -8,27 +8,24 @@ The purpose of this app is to explore different "Desktop Modernization" technolo
 
 ||.NET Framework 4.7 |.NET Core 3|
 |-|-|-|
-|Store Release|[![rel badge](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/3/3)](https://bit.ly/msix-catalog)|[![rel badge](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/5/5)](https://bit.ly/msix-catalog-core)|
-|Sideload from WebApp|[![Rel Badge](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/1/1)](http://msix-catalog.azurewebsites.net/AppxPackages) |[![](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/4/4)](http://msix-catalog.azurewebsites.net/netcore3)|
-|Sideload from AppCenter|[![Build status](https://build.appcenter.ms/v0.1/apps/a92bf008-9e06-4c8c-8a30-d7f6099c3242/branches/dev/badge)](https://install.appcenter.ms/users/rido/apps/msix-catalog/distribution_groups/public)|[![Build Status](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/4/4)](https://install.appcenter.ms/users/rido/apps/msix-catalog-core/distribution_groups/public)|
+|Store Release|[![rel badge](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/6/9)](https://bit.ly/msix-catalog)|[![rel badge](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/6/11)](https://bit.ly/msix-catalog-core)|
+|Sideload from WebApp|[![Rel Badge](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/6/6)](http://msix-catalog.azurewebsites.net/FX) |[![](https://rido.vsrm.visualstudio.com/_apis/public/Release/badge/3946e8eb-731c-4bd3-a330-f374e4f8a046/6/10)](http://msix-catalog.azurewebsites.net/NC3)|
+
 
 ### Sideload packages are signed with a developer certificate
 
 > Install [Cert Central](https://certcentral.x509.online/) Client (aka ccc) with `dotnet tool install -g dotnet-ccc` (requires .NET Core 2.1 SDK)
 
 Sideloaded packages are signed with a different certificates for AppCenter and WebApps, to install these certs you must trust the signer by running the next command from an elevated command prompt: 
 
-- From AppCenter: `ccc trust -u ridomin -t C5A4ABA7655B2B11C41FAAE43A9D4FC2FA438E6F`
-- From WebApp: `ccc trust -u ridomin -t 728511CC02E6A80B45ABC0CC862FEF1BFD9617D7`
+- `ccc trust -u ridomin -t 728511CC02E6A80B45ABC0CC862FEF1BFD9617D7`
 
 >The ccc trust command adds the certificate to your LocalMachine\TrustedPeople certificate store
 
-The certificates are also available as gists:
-- [RidoStoreId-SelfSigned](https://gist.githubusercontent.com/ridomin/2d0544e3c62e121d3715af44c90633fb/raw/2f9d72ecbc07f76db2f2869c95ea49dc9aaad292/RidoStoreID-Fake.csr)
+The certificate is also available as gists:
 - [RidoTheDev](https://gist.githubusercontent.com/ridomin/85ffb2f933c68683b87bbfb27ca114cf/raw/77ac9ac02dc553e4c7810c7ddb1cfa4c0ba6e6db/RidoTheDev.cer)
 
 
-
 ## .NET Flavors
 
 The source code is shared between .NET Framework and .NET Core using different project files in the same folder.

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,27 +4,82 @@
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
 pool:
-  vmImage: 'VS2017-Win2016'
+  name: UWPLatest
 
 variables:
-  solution: 'msix.catalog.net.sln'
   solutioncore: 'msix.catalog.core.sln'
-  buildPlatform: 'Any CPU'
+  buildPlatform: 'x86'
   buildConfiguration: 'Release'
 
+strategy:
+  matrix:
+    Channel_FX_CD:
+      Solution: msix.catalog.net.sln
+      Channel_Name: FX_CD
+      DistURL: https://msix-catalog.azurewebsites.net/FX
+      MsixPublisherId: CN=RidoTheDev
+      MsixPackageId: MSIXCatalog.CD
+      MsixPackageDisplayName: MSIX Catalog (CD)
+      MsixManifest: msix.catalog.package.net\package.appxmanifest
+      MsixBuildMode: SideLoadOnly
+      MsixGenerateAppInstaller: true
+    Channel_FX_PROD:
+      Solution: msix.catalog.net.sln
+      Channel_Name: FX_PROD
+      DistURL: https://not/used
+      MsixPublisherId: CN=FD784322-3D44-4DA4-9F73-0E23D5DF0893
+      MsixPackageId: 18656RidoMin.MSIXCatalog
+      MsixPackageDisplayName: MSIX Catalog
+      MsixManifest: msix.catalog.package.net\package.appxmanifest
+      MsixBuildMode: CI
+      MsixGenerateAppInstaller: false
+    Channel_CORE_CD:
+      Solution: msix.catalog.core.sln
+      Channel_Name: CORE_CD
+      DistURL: https://msix-catalog.azurewebsites.net/NC3
+      MsixPublisherId: CN=RidoTheDev
+      MsixPackageId: MSIXCatalog.CoreCD
+      MsixPackageDisplayName: MSIX Catalog Core (CD)
+      MsixManifest: msix.catalog.package.core\package.appxmanifest
+      MsixBuildMode: SideLoadOnly
+      MsixGenerateAppInstaller: true
+    Channel_CORE_PROD:
+      Solution: msix.catalog.core.sln
+      Channel_Name: CORE_PROD
+      DistURL: https://not/used
+      MsixPublisherId: CN=FD784322-3D44-4DA4-9F73-0E23D5DF0893
+      MsixPackageId: 18656RidoMin.MSIXCatalogCore
+      MsixPackageDisplayName: MSIX Catalog Core
+      MsixManifest: msix.catalog.package.core\package.appxmanifest
+      MsixBuildMode: CI
+      MsixGenerateAppInstaller: false
+
 steps:
-- task: NuGetToolInstaller@0
-  inputs:
-    versionSpec: '4.9.3' 
+- script: nbgv cloud -c
+  displayName: Set Version
+
+- powershell: |
+    # Update appxmanifest. This must be done before build.
+    # Set the per-channel values into the appxmanifest, replacing the checked-in values
+    [xml]$manifest= get-content "$(MsixManifest)"
+    $manifest.Package.Identity.Version = "$(GitBuildVersionSimple).0"
+    $manifest.Package.Identity.Name = "$(MsixPackageId)"
+    $manifest.Package.Identity.Publisher = "$(MsixPublisherId)"
+    $manifest.Package.Properties.DisplayName = "$(MsixPackageDisplayName)"
+    $manifest.Package.Applications.Application.VisualElements.DisplayName = "$(MsixPackageDisplayName)"
+    $manifest.save("$(MsixManifest)")
 
-- task: NuGetCommand@2
-  inputs:
-    command: 'restore' 
-    restoreSolution: '$(solution)' 
-
 - task: MSBuild@1
   inputs:
     solution: '$(solution)'
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
-    msbuildArguments: '/p:AppxPackageSigningEnabled=false;GenerateAppInstallerFile=false'
+    msbuildArguments: '/restore /p:AppxPackageSigningEnabled=false;GenerateAppInstallerFile=$(MsixGenerateAppInstaller);AppxPackageDir=$(Build.ArtifactStagingDirectory);AppInstallerUri=$(DistURL);UapAppxPackageBuildMode=$(MsixBuildMode)'
+  displayName: 'Building..'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    PathtoPublish: $(Build.ArtifactStagingDirectory)
+    ArtifactName: $(Channel_Name)
+    publishLocation: Container
+  displayName: CopyingArtifacts
diff --git a/msix.catalog.app/Properties/AssemblyInfo.cs b/msix.catalog.app/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("0.0.0.1")]
-[assembly: AssemblyFileVersion("0.0.0.1")]
+//[assembly: AssemblyVersion("0.0.0.1")]
+//[assembly: AssemblyFileVersion("0.0.0.1")]
diff --git a/msix.catalog.app/ViewModels/AboutViewModel.cs b/msix.catalog.app/ViewModels/AboutViewModel.cs
@@ -43,5 +43,6 @@ private void NavigateToGitHub(AboutViewModel obj)
         public string DotNetFlavor => ThisAppVersionInfo.DotNetFlavor;
         public string InstalledFrom => ThisAppVersionInfo.AppInstallerUri;
         public string SignatureKind => ThisAppVersionInfo.SignatureKind;
+        public string AssemblyVersionInfo => ThisAppVersionInfo.AssemblyVersionInfo;
     }
 }
diff --git a/msix.catalog.app/ViewModels/PackageInfoViewModel.cs b/msix.catalog.app/ViewModels/PackageInfoViewModel.cs
@@ -94,12 +94,14 @@ public void OpenFolder(PackageInfoViewModel package)
         public void CopyToClipboard(PackageInfoViewModel package)
         {
             StringBuilder ClipboardText = new StringBuilder();
-            ClipboardText.Append(package.PackageInfo.Id + Environment.NewLine);
-            ClipboardText.Append(package.PackageInfo.Version + Environment.NewLine);
-            ClipboardText.Append(package.PackageInfo.Architecture + Environment.NewLine);
-            ClipboardText.Append(package.PackageInfo.Author + Environment.NewLine);
-            ClipboardText.Append(package.PackageInfo.InstalledDate + Environment.NewLine);
-            ClipboardText.Append(package.PackageInfo.InstallLocation + Environment.NewLine);
+            ClipboardText.AppendLine(package.PackageInfo.Id);
+            ClipboardText.AppendLine(package.PackageInfo.Version);
+            ClipboardText.AppendLine (package.PackageInfo.Architecture);
+            ClipboardText.AppendLine(package.PackageInfo.Author);
+            ClipboardText.AppendLine(package.PackageInfo.InstalledDate.ToString());
+            ClipboardText.AppendLine(package.PackageInfo.InstallLocation);
+            ClipboardText.AppendLine(package.PackageInfo.PackageFullName);
+            ClipboardText.AppendLine(package.PackageInfo.PackageName);
 
             Clipboard.SetText(ClipboardText.ToString());
         }

diff --git a/msix.catalog.app/Views/AboutPage.xaml b/msix.catalog.app/Views/AboutPage.xaml
@@ -32,8 +32,8 @@
                Source="{Binding AppLogo}" Width="44" Height="44" />-->
 
         <TextBlock Text="MSIX Catalog" Grid.Row="0" FontSize="20" HorizontalAlignment="Left" Margin="5"/>
-
-        <StackPanel Grid.Row="1"  Orientation="Vertical" Margin="10" HorizontalAlignment="Left">
+        <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" CanContentScroll="True" Grid.Row="1">
+            <StackPanel   Orientation="Vertical" Margin="10" HorizontalAlignment="Left">
             <StackPanel Orientation="Vertical" Margin="5">
                 <TextBlock Text="Version: " FontSize="16"/>
                 <TextBlock Text="{Binding VersionString}" FontSize="16" AutomationProperties.AutomationId="LabelVersion"/>
@@ -43,6 +43,10 @@
                 </Hyperlink>        
                 </TextBlock>
             </StackPanel>
+            <StackPanel Orientation="Vertical" Margin="5">
+                <TextBlock Text="Assembly Version: "/>
+                <TextBlock Text="{Binding AssemblyVersionInfo}"  />
+            </StackPanel>
             <StackPanel Orientation="Vertical" Margin="5">
                 <TextBlock Text="Publisher: "/>
                 <TextBlock Text="{Binding PublisherDisplayName}"  />
@@ -83,6 +87,6 @@
                 <TextBlock Text="{Binding  Metadata}" />
             </Border>
         </StackPanel>
-
+        </ScrollViewer>
     </Grid>
 </Page>
diff --git a/msix.catalog.app/msix.catalog.app.net.csproj b/msix.catalog.app/msix.catalog.app.net.csproj
@@ -106,15 +106,20 @@
       <Version>2.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer">
-      <Version>2.9.1</Version>
+      <Version>2.8.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.DotNet.Framework.NativeImageCompiler">
       <Version>1.0.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.17763.1000-preview</Version>
+      <Version>10.0.18362.2002-preview</Version>
+    </PackageReference>
+    <PackageReference Include="Nerdbank.GitVersioning">
+      <Version>2.3.151</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/msix.catalog.lib/ThisAppVersionInfo.cs b/msix.catalog.lib/ThisAppVersionInfo.cs
@@ -112,7 +112,7 @@ public static DateTimeOffset InstalledOn
             }
         }
 
-        public static string DotNetFlavor => typeof(string).Assembly.Location;
+        public static string DotNetFlavor => $"{typeof(object).Assembly.Location} \r\n [{typeof(object).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion}]";
 
         public static string SignatureKind => OSVersionHelper.WindowsVersionHelper.HasPackageIdentity ? Package.Current.SignatureKind.ToString() : "";
 
@@ -209,6 +209,8 @@ public static string GetDeploymentType()
 
         public static string ProductVersion => FileVersionInfo.GetVersionInfo(Assembly.GetEntryAssembly().Location).ProductVersion;
 
+        public static string AssemblyVersionInfo = ThisAssembly.AssemblyInformationalVersion;
+
         public static string GetDotNetInfo()
         {
             string result = "";

diff --git a/msix.catalog.lib/msix.catalog.lib.csproj b/msix.catalog.lib/msix.catalog.lib.csproj
@@ -15,7 +15,11 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17763.1000-preview" />
+	  <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
+	  <PackageReference Include="Nerdbank.GitVersioning" Version="2.3.151">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
 	  <PackageReference Include="OSVersionHelper" Version="1.0.10" />
 	</ItemGroup>
 </Project>
diff --git a/msix.catalog.net.sln b/msix.catalog.net.sln
@@ -5,8 +5,10 @@ VisualStudioVersion = 16.0.28726.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{54FD8F69-0C9B-43E6-B67D-6F7AEEA52B97}"
 	ProjectSection(SolutionItems) = preProject
+		Directory.Build.props = Directory.Build.props
 		nuget.config = nuget.config
 		UpdateManifest.ps1 = UpdateManifest.ps1
+		version.json = version.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "msix.catalog.lib", "msix.catalog.lib\msix.catalog.lib.csproj", "{33A9BE42-B6C5-431C-BAC6-541D693BB121}"

diff --git a/msix.catalog.package.core/Package.appxmanifest b/msix.catalog.package.core/Package.appxmanifest
@@ -7,7 +7,7 @@
   IgnorableNamespaces="uap rescap">
 
   <Identity
-    Name="18656RidoMin.MSIXCatalogCore"
+    Name="MSIXCatalogCore.local"
     Publisher="CN=FD784322-3D44-4DA4-9F73-0E23D5DF0893"
     Version="0.0.1.0" />
 

diff --git a/msix.catalog.package.core/msix.catalog.package.core.wapproj b/msix.catalog.package.core/msix.catalog.package.core.wapproj
@@ -36,35 +36,15 @@
   <PropertyGroup>
     <ProjectGuid>42cd17c5-9f44-4279-80c8-5e6615ad29a4</ProjectGuid>
     <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.16299.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <GenerateAppInstallerFile>True</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>9B49D183108CEA06463256C3AA5BF20F6D03F6D0</PackageCertificateThumbprint>
-    <AppInstallerUri>https://msix-catalog.azurewebsites.net/netcore3</AppInstallerUri>
+    <AppxBundle>Always</AppxBundle>
     <EntryPointProjectUniqueName>..\msix.catalog.app\msix.catalog.app.core.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Never</AppxBundle>
-  </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
@@ -75,10 +55,6 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\msix.catalog.app\msix.catalog.app.core.csproj">
-      <DesktopBridgeSelfContained>False</DesktopBridgeSelfContained>
-      <DesktopBridgeIdentifier>
-      </DesktopBridgeIdentifier>
-      <Properties>DesktopBridgeSelfContained=%(DesktopBridgeSelfContained);DesktopBridgeIdentifier=%(DesktopBridgeIdentifier)</Properties>
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>

diff --git a/msix.catalog.package.net/Package.appxmanifest b/msix.catalog.package.net/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap rescap">
-  <Identity Name="18656RidoMin.MSIXCatalog" Publisher="CN=FD784322-3D44-4DA4-9F73-0E23D5DF0893" Version="0.0.1.1" />
+  <Identity Name="MSIXCatalog.local" Publisher="CN=FD784322-3D44-4DA4-9F73-0E23D5DF0893" Version="0.0.1.1" />
   <Properties>
     <DisplayName>MSIX Catalog</DisplayName>
     <PublisherDisplayName>Rido Min</PublisherDisplayName>

diff --git a/msix.catalog.package.net/msix.catalog.package.net.wapproj b/msix.catalog.package.net/msix.catalog.package.net.wapproj
@@ -36,35 +36,14 @@
   <PropertyGroup>
     <ProjectGuid>79223a6c-f495-4c85-8543-fadeaff92526</ProjectGuid>
     <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <DefaultLanguage>en-US</DefaultLanguage>
     <EntryPointProjectUniqueName>..\msix.catalog.app\msix.catalog.app.net.csproj</EntryPointProjectUniqueName>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
     <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
+    <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
-    <AppInstallerUri>https://msix-catalog.azurewebsites.net/AppxPackages</AppInstallerUri>
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
-    <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
-    <PackageCertificateThumbprint>9B49D183108CEA06463256C3AA5BF20F6D03F6D0</PackageCertificateThumbprint>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
   </PropertyGroup>
   <ItemGroup>
     <AppxManifest Include="Package.appxmanifest">
@@ -73,7 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Images\*.png" />
-    <Content Include="Images\WideTile.scale-200.png" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\msix.catalog.app\msix.catalog.app.net.csproj" />

diff --git a/version.json b/version.json
@@ -0,0 +1,12 @@
+{
+  "version": "0.2",
+  "publicReleaseRefSpec": [
+    "^refs/heads/master$",
+    "^refs/heads/v\\d+(?:\\.\\d+)?$"
+  ],
+  "cloudBuild": {
+    "buildNumber": {
+      "enabled": true
+    }
+  }
+}