On the '1.3.x' branch: backport r3421, r3422, r3423, r3424, r3425. Changed paths: M /poshsvn/branches/1.3.x M /poshsvn/branches/1.3.x/.github/workflows/release.yml M /poshsvn/branches/1.3.x/CHANGELOG.md M /poshsvn/branches/1.3.x/Version.props M /poshsvn/branches/1.3.x/build.ps1 Property changes on: poshsvn/branches/1.3.x ___________________________________________________________________ Modified: svn:mergeinfo Merged /poshsvn/trunk:r3421-3425 Modified: poshsvn/branches/1.3.x/.github/workflows/release.yml =================================================================== --- poshsvn/branches/1.3.x/.github/workflows/release.yml (rev 3425) +++ poshsvn/branches/1.3.x/.github/workflows/release.yml (rev 3426) @@ -43,7 +43,6 @@ - x86 env: - MSBuildCommonParameters: /property:Configuration=Release /property:Platform=${{ matrix.platform }} outdir: ${{ github.workspace }}\bin\Release-${{ matrix.platform }} steps: @@ -63,7 +62,7 @@ # Build - name: Build - run: ./build.ps1 + run: ./build.ps1 -Platform ${{ matrix.platform }} - name: Sign Installer uses: azure/trusted-sig...@v0.5.1 Modified: poshsvn/branches/1.3.x/CHANGELOG.md =================================================================== --- poshsvn/branches/1.3.x/CHANGELOG.md (rev 3425) +++ poshsvn/branches/1.3.x/CHANGELOG.md (rev 3426) @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +# [1.3.3] + +- Release improvements. + # [1.3.2] - Release improvements. Modified: poshsvn/branches/1.3.x/Version.props =================================================================== --- poshsvn/branches/1.3.x/Version.props (rev 3425) +++ poshsvn/branches/1.3.x/Version.props (rev 3426) @@ -2,7 +2,7 @@ <PropertyGroup> <VersionMajor>1</VersionMajor> <VersionMinor>3</VersionMinor> - <VersionPatch>2</VersionPatch> + <VersionPatch>3</VersionPatch> </PropertyGroup> <PropertyGroup> <Version>$(VersionMajor).$(VersionMinor).$(VersionPatch)</Version> Modified: poshsvn/branches/1.3.x/build.ps1 =================================================================== --- poshsvn/branches/1.3.x/build.ps1 (rev 3425) +++ poshsvn/branches/1.3.x/build.ps1 (rev 3426) @@ -1,7 +1,7 @@ [CmdletBinding()] param ( [Parameter()] - [ValidateSet("Core", "Installer", "All", "SvnDist", "platyPS")] + [ValidateSet("Core", "Installer", "All", "SvnDist", "platyPS", "Package")] [string] $Target = "All", @@ -8,7 +8,17 @@ # Launches the installer after build. [Parameter()] [switch] - $Install + $Install, + + [Parameter()] + [ValidateSet("Release", "Debug")] + [string] + $Configuration = "Release", + + [Parameter()] + [ValidateSet("x64", "x86")] + [string] + $Platform = "x64", ) if ($Target -ne "All" -and $Target -ne "Installer" -and $Install) { @@ -21,6 +31,9 @@ elseif ($Target -eq "Core") { $msbuildTarget = "PoshSvn" } +elseif ($Target -eq "Package") { + $msbuildTarget = "PoshSvn_Package" +} else { $msbuildTarget = $Target } @@ -29,7 +42,9 @@ $installationPath = & $vswhere -property "installationPath" $msbuild = "$installationPath\MSBuild\Current\Bin\MSBuild.exe" -& $msbuild /property:Configuration=Release /t:$msbuildTarget /restore /fileLogger /fileLoggerParameters:verbosity=normal +& $msbuild /property:Configuration=$Configuration /property:Platform=$Platform ` + /t:$msbuildTarget /restore ` + /fileLogger /fileLoggerParameters:verbosity=normal if ($Install) { msiexec.exe /i bin\Release-x64\Installer\en-US\PoshSvn.msi /qb