Add versioning function to MakeAppX.ps1

Grabacr07 · Dec 12, 2016 · 70dea5f · 70dea5f
1 parent fefae05
commit 70dea5f
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 7 deletions.
diff --git a/packaging/MakeAppX.ps1 b/packaging/MakeAppX.ps1
@@ -5,7 +5,11 @@
         $target = 'Release (AppX)'
         $bin = '..\source\SylphyHorn\bin'
 
-        $targetKeywords = '*.exe','*.dll','*.exe.config','*.txt','*.VisualElementsManifest.xml', '*.png', 'AppxManifest.xml'
+        $appxManifest = 'AppxManifest.xml'
+        $appxManifestSource = 'app.appxmanifest'
+        $versionSource = 'SylphyHorn.exe'
+
+        $targetKeywords = '*.exe','*.dll','*.exe.config','*.txt','*.VisualElementsManifest.xml', '*.png', $appxManifest
         $ignoreKeyword  = '*.vshost.*'
 
         $appx = 'SylphyHorn.appx'
@@ -37,7 +41,13 @@
             Get-ChildItem | where { $_.Name -eq $appx -or $_.Name -eq $appxBundle } | Remove-Item
             Get-ChildItem | where Name -Like "_*" | Remove-Item
 
-            New-MappingFile -SourcePath $(Join-Path $bin $target) -Filename $appxMapping -Targets $targetKeywords -Exclude $ignoreKeyword
+            $source = Join-Path $bin $target -Resolve
+            $version = $(Get-ChildItem (Join-Path $source $versionSource)).VersionInfo.FileVersion
+
+            # replace version in appxmanifest with assembly version
+            $(Get-Content (Join-Path $source $appxManifestSource -Resolve)) -replace 'Version="0.0.0.0"', (' Version="{0}"' -f $version) | Out-File (Join-Path $source $appxManifest) -Encoding UTF8
+
+            New-MappingFile -SourcePath $source -Filename $appxMapping -Targets $targetKeywords -Exclude $ignoreKeyword
 
             Start-SdkTool -SdkPath $win10Sdk -ToolName 'makeappx' -Arguments "pack /l /f $appxMapping /p $appx"
             Start-SdkTool -SdkPath $win10Sdk -ToolName 'signtool' -Arguments "sign /f $storekey /fd SHA256 /v $appx"            
@@ -50,7 +60,7 @@
 
             New-MappingFile -SourcePath '.\' -Filename $appxBundleMapping -Targets $appx
 
-            Start-SdkTool -SdkPath $win10Sdk -ToolName 'makeappx' -Arguments "bundle /f $appxBundleMapping /p $appxBundle"
+            Start-SdkTool -SdkPath $win10Sdk -ToolName 'makeappx' -Arguments "bundle /f $appxBundleMapping /p $appxBundle /bv $version"
         }
         catch
         {
@@ -117,6 +127,49 @@ function New-MappingFile
     }
 }
 
+function hoge
+{
+    [CmdletBinding()]
+    param
+    (
+        [parameter(
+            mandatory = 1,
+            position  = 0,
+            ValueFromPipeline = 1,
+            ValueFromPipelineByPropertyName = 1)]
+        [string]
+        $SdkPath,
+
+        [parameter(
+            mandatory = 1,
+            position  = 1,
+            ValueFromPipelineByPropertyName = 1)]
+        [string]
+        $ToolName,
+
+        [parameter(
+            mandatory = 1,
+            position  = 2,
+            ValueFromPipelineByPropertyName = 1)]
+        [string]
+        $Arguments
+    )
+
+    begin
+    {
+        $exe = (Join-Path $SdkPath ($ToolName + '.exe'))
+    }
+
+    end
+    {
+        Write-Host $ToolName $Arguments
+        Write-Host '----------'
+        & $exe ($Arguments -split " ")
+        Write-Host ''
+        Write-Host ''
+    }
+}
+
 function Start-SdkTool
 {
     [CmdletBinding()]

diff --git a/source/SylphyHorn/Properties/AssemblyInfo.cs b/source/SylphyHorn/Properties/AssemblyInfo.cs
@@ -11,5 +11,5 @@
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
 [assembly: ComVisible(false)]
diff --git a/source/SylphyHorn/SylphyHorn.csproj b/source/SylphyHorn/SylphyHorn.csproj
@@ -299,7 +299,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="app.config" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SylphyHorn.Core\SylphyHorn.Core.csproj">
@@ -325,7 +325,7 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="AppxManifest.xml">
+    <None Include="app.appxmanifest">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>

diff --git a/source/SylphyHorn/AppxManifest.xml → source/SylphyHorn/app.appxmanifest b/source/SylphyHorn/AppxManifest.xml → source/SylphyHorn/app.appxmanifest
@@ -7,7 +7,7 @@
   <Identity Name="46846grabacr.net.SylphyHorn"
             ProcessorArchitecture="x86"
             Publisher="CN=33C1D2CA-4B3F-4CCA-8103-6D02939C6477"
-            Version="2.2.0.0" />
+            Version="0.0.0.0" />
   <Properties>
     <DisplayName>SylphyHorn</DisplayName>
     <PublisherDisplayName>grabacr.net</PublisherDisplayName>