diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index 593bafc029..f149be5786 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -59,7 +59,7 @@ build: - from: 'installer\PowerToysSetup\x64\Release' to: 'Build_Installer_Output' include: - - 'PowerToysSetup.msi' + - 'PowerToysSetup-*.msi' signing_options: sign_inline: true # This does signing a soon as this command completes # - !!buildcommand diff --git a/installer/MSIX/build_msix_cdpx.cmd b/installer/MSIX/build_msix_cdpx.cmd index 798afe5ec0..94ed4ea199 100644 --- a/installer/MSIX/build_msix_cdpx.cmd +++ b/installer/MSIX/build_msix_cdpx.cmd @@ -1,4 +1,14 @@ cd /D "%~dp0" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -winsdk=10.0.18362.0 + +powershell -file update_appxmanifest_version.ps1 || exit /b 1 + call makeappx build /v /overwrite /f PackagingLayout.xml /id "PowerToys-x64" /op bin\ || exit /b 1 + +setlocal EnableDelayedExpansion +for /f "tokens=3delims=<>" %%i in ('findstr "" "..\Version.props"') do ( + set MSIXVERSION=%%i +) +setlocal DisableDelayedExpansion +ren "bin\PowerToys-x64.msix" PowerToysSetup-%MSIXVERSION%-x64.msix diff --git a/installer/MSIX/update_appxmanifest_version.ps1 b/installer/MSIX/update_appxmanifest_version.ps1 new file mode 100644 index 0000000000..59a0134790 --- /dev/null +++ b/installer/MSIX/update_appxmanifest_version.ps1 @@ -0,0 +1,5 @@ +$version = ([xml](Get-Content ..\Version.props)).Project.PropertyGroup.Version + +(Get-Content appxmanifest.xml) ` + -replace '(Name="[\.\w]+"\sVersion=")([\d\.]+)"', -join('${1}', $version, '.0"') ` + | Out-File -Encoding utf8 appxmanifest.xml \ No newline at end of file diff --git a/installer/PowerToysSetup/PowerToysSetup.wixproj b/installer/PowerToysSetup/PowerToysSetup.wixproj index cad07f0fed..857b47f270 100644 --- a/installer/PowerToysSetup/PowerToysSetup.wixproj +++ b/installer/PowerToysSetup/PowerToysSetup.wixproj @@ -1,13 +1,14 @@ + Release x64 3.10 022a9d30-7c4f-416d-a9df-5ff2661cc0ad 2.0 - PowerToysSetup + PowerToysSetup-$(Version)-$(Platform) Package True diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index fa49c2ab3b..a4601221f8 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -8,7 +8,7 @@ @@ -18,9 +18,9 @@ + IncludeMinimum="yes" IncludeMaximum="no" /> diff --git a/installer/Version.props b/installer/Version.props new file mode 100644 index 0000000000..af45576696 --- /dev/null +++ b/installer/Version.props @@ -0,0 +1,7 @@ + + + + 0.15.2 + Version=$(Version); + + \ No newline at end of file diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj index 51aa2c9864..206522946b 100644 --- a/src/common/common.vcxproj +++ b/src/common/common.vcxproj @@ -1,5 +1,20 @@ + + + + + + + + + + Debug diff --git a/src/common/version.h b/src/common/version.h index f4a3776343..264b8905cc 100644 --- a/src/common/version.h +++ b/src/common/version.h @@ -2,18 +2,15 @@ #define STRINGIZE2(s) #s #define STRINGIZE(s) STRINGIZE2(s) - -#define VERSION_MAJOR 0 -#define VERSION_MINOR 15 -#define VERSION_REVISION 2 + +#include "Generated Files\version_gen.h" #define FILE_VERSION VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, 0 #define FILE_VERSION_STRING \ STRINGIZE(VERSION_MAJOR) \ "." STRINGIZE(VERSION_MINOR) "." STRINGIZE(VERSION_REVISION) ".0" - #define PRODUCT_VERSION FILE_VERSION #define PRODUCT_VERSION_STRING FILE_VERSION_STRING - #define COMPANY_NAME "Microsoft Corporation" + #define COPYRIGHT_NOTE "Copyright (C) 2019 Microsoft Corporation" diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj index c95e4e975e..b134ab9aab 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj +++ b/src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj @@ -1,6 +1,48 @@  + + + + FancyZonesEditor + Microsoft Corp. + Copyright (C) 2019 Microsoft Corp. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Debug AnyCPU @@ -163,7 +205,7 @@ - + Code diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs deleted file mode 100644 index 4b4e266165..0000000000 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Microsoft Corporation -// The Microsoft Corporation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows; - -// 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("FancyZonesEditor")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft Corp.")] -[assembly: AssemblyProduct("FancyZonesEditor")] -[assembly: AssemblyCopyright("Copyright (C) 2019 Microsoft Corp.")] -[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 -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// In order to begin building localizable applications, set -// CultureYouAreCodingWith in your .csproj file -// inside a . For example, if you are using US english -// in your source files, set the to en-US. Then uncomment -// the NeutralResourceLanguage attribute below. Update the "en-US" in -// the line below to match the UICulture setting in the project file. - -// [assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] -// ThemeInfo.None = where theme specific resource dictionaries are located -// (used if a resource is not found in the page, -// or application resource dictionaries) -// ThemeInfo.SourceAssembly = where the generic resource dictionary is located -// (used if a resource is not found in the page, -// app, or any theme specific resource dictionaries) -[assembly: ThemeInfo( - ResourceDictionaryLocation.None, - ResourceDictionaryLocation.SourceAssembly)] - -// 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("0.15.2.0")] -[assembly: AssemblyFileVersion("0.15.2.0")]