Fix string

Update nugets Update pipeline with git version
Yugen-Apps · Jul 8, 2020 · d325450 · d325450
1 parent 2f1b41b
commit d325450
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/Yugen.Mosaic.Uwp.sln b/Yugen.Mosaic.Uwp.sln
@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure", "Azure", "{E44DE1EE-E0B3-4250-8CBE-F9B13C6DF19A}"
 	ProjectSection(SolutionItems) = preProject
 		build-pipelines.yml = build-pipelines.yml
+		GitVersion.yml = GitVersion.yml
 	EndProjectSection
 EndProject
 Global

diff --git a/Yugen.Mosaic.Uwp/Strings/en-US/Resources.resw b/Yugen.Mosaic.Uwp/Strings/en-US/Resources.resw
@@ -130,7 +130,7 @@
     <value>Click here to choose a Master image</value>
   </data>
   <data name="MainAddTilesFolderTextBlock.Text" xml:space="preserve">
-    <value>Add Tiles From Folder</value>
+    <value>Add Tiles from Folder</value>
   </data>
   <data name="MainAddTilesTextBlock.Text" xml:space="preserve">
     <value>Add Tiles</value>

diff --git a/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj b/Yugen.Mosaic.Uwp/Yugen.Mosaic.Uwp.csproj
@@ -232,10 +232,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AppCenter.Analytics">
-      <Version>3.2.2</Version>
+      <Version>3.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AppCenter.Crashes">
-      <Version>3.2.2</Version>
+      <Version>3.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.10</Version>
@@ -256,7 +256,7 @@
       <Version>1.0.0-rc0001</Version>
     </PackageReference>
     <PackageReference Include="WriteableBitmapEx">
-      <Version>1.6.5</Version>
+      <Version>1.6.7</Version>
     </PackageReference>
     <PackageReference Include="Yugen.Toolkit.Standard">
       <Version>1.0.37</Version>

diff --git a/build-pipelines.yml b/build-pipelines.yml
@@ -17,24 +17,16 @@ variables:
   appxPackageDir: '$(build.artifactStagingDirectory)\AppxPackages\\'
   appxmanifest: '**/*.appxmanifest'
   versionNumber: 'Set dynamically below in a task'
-
-name: '$(Rev:r)'
+  
+name: $(GITVERSION_AssemblySemFileVer)
 
 steps:
 
-- task: PowerShell@2
+- task: UseGitVersion@5
+  displayName: GitVersion
+  continueOnError: true
   inputs:
-    targetType: 'inline'
-    script: |
-      [xml] $manifestXml = Get-Content '$(appxmanifest)'
-      $version = [version]$manifestXml.Package.Identity.Version
-
-      [string] $newVersion = "{0}.{1}.{2}.{3}" -f $version.Major, $version.Minor, $(Build.BuildNumber), 0
-      Write-Host "Setting the release version number variable to '$newVersion'."
-      Write-Host "##vso[task.setvariable variable=versionNumber]$newVersion"
-
-      Write-Host "Setting the name of the build to '$newVersion'."
-      Write-Host "##vso[build.updatebuildnumber]$newVersion"
+    versionSpec: '5.x'
 
 - task: NuGetToolInstaller@1
 
@@ -48,7 +40,8 @@ steps:
     restoreSolution: '$(solution)'
 
 - task: VersionAPPX@2
-  displayName: 'Version MSIX'
+  inputs:
+    VersionNumber: '$(GitVersion.AssemblySemFileVer)'
 
 - task: VSBuild@1
   inputs: