From ac06ff6c23f66d7de611ea3599706358dc5ec0a7 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 26 Oct 2022 19:47:24 +0200 Subject: [PATCH 01/14] Changed set-output --- .github/workflows/handle-tag.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/handle-tag.yml b/.github/workflows/handle-tag.yml index be38959a..3077c6fe 100644 --- a/.github/workflows/handle-tag.yml +++ b/.github/workflows/handle-tag.yml @@ -15,7 +15,7 @@ jobs: id: tag-commit-hash run: | hash=${{ github.sha }} - echo "::set-output name=tag-hash::${hash}" + echo "{name}=tag-hash::${hash}" >> $GITHUB_OUTPUT echo $hash - name: Checkout main @@ -27,7 +27,7 @@ jobs: id: main-commit-hash run: | hash=$(git log -n1 --format=format:"%H") - echo "::set-output name=main-hash::${hash}" + echo "{name}=main-hash::${hash}" >> $GITHUB_OUTPUT echo $hash - name: Verify tag commit matches main commit - exit if they don't match From 8435ba812159b14167fa17505ee18cd427c012a4 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 15:03:39 +0100 Subject: [PATCH 02/14] Support beta releases (#26) * Add tag support * Allow anything after the version numbers * Adding number version * Update script * Fix --- .github/workflows/build-test.yml | 32 ++++++++++++++++++++++++-------- .github/workflows/handle-tag.yml | 2 +- .github/workflows/publish.yml | 14 +++++++++++++- GetNumberVersion.ps1 | 20 ++++++++++++++++++++ 4 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 GetNumberVersion.ps1 diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 1a64a2f9..aebb695d 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -46,21 +46,37 @@ jobs: - name: Show version run: echo "Building version ${{ inputs.release-version }}" + - name: Get digital version + id: get-digital-version + env: + ReleaseVersion: ${{ inputs.release-version }} + run: | + $numberVersion = .\GetNumberVersion -Version ${{env.ReleaseVersion}} + echo "Setting numberVersion to $numberVersion" + echo "NUMBER_VERSION=$numberVersion" >> $env:GITHUB_ENV + - name: Set fileversion on all .NET Framework assemblies and assembly version on the exe env: - Version: ${{ inputs.release-version }} + ReleaseVersion: ${{ inputs.release-version }} run: | $sbeFileName = "$env:GITHUB_WORKSPACE\src\ServiceBusExplorer\Properties\AssemblyInfo.cs" - .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyVersion' -Version ${{env.Version}} - .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyFileVersion' -Version ${{env.Version}} - .\SetVersion -FileName "$env:GITHUB_WORKSPACE\src\Common\Properties\AssemblyInfo.cs" -PropertyName 'AssemblyFileVersion' -Version ${{env.Version}} - .\SetVersion -FileName "$env:GITHUB_WORKSPACE\src\NotificationHubs\Properties\AssemblyInfo.cs" -PropertyName 'AssemblyFileVersion' -Version ${{env.Version}} + .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyVersion' -Version ${{env.NUMBER_VERSION}} + .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyFileVersion' -Version ${{env.NUMBER_VERSION}} + .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyInformationalVersion' -Version ${{env.ReleaseVersion}} + + $commonInfoFile = "$env:GITHUB_WORKSPACE\src\Common\Properties\AssemblyInfo.cs" + .\SetVersion -FileName $commonInfoFile -PropertyName 'AssemblyFileVersion' -Version ${{env.NUMBER_VERSION}} + .\SetVersion -FileName $commonInfoFile -PropertyName 'AssemblyInformationalVersion' -Version ${{env.ReleaseVersion}} + + $notificationHubsInfoFile = "$env:GITHUB_WORKSPACE\src\NotificationHubs\Properties\AssemblyInfo.cs" + .\SetVersion -FileName $notificationHubsInfoFile -PropertyName 'AssemblyFileVersion' -Version ${{env.NUMBER_VERSION}} + .\SetVersion -FileName $notificationHubsInfoFile -PropertyName 'AssemblyInformationalVersion' -Version ${{env.ReleaseVersion}} - name: Build - env: - Version: ${{ inputs.release-version }} + # env: + # Version: ${{ inputs.release-version }} run: | - msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.Version}} ${{env.SOLUTION_FILE_PATH}} + msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.NUMBER_VERSION}} ${{env.SOLUTION_FILE_PATH}} - name: Run tests run: | diff --git a/.github/workflows/handle-tag.yml b/.github/workflows/handle-tag.yml index 3077c6fe..658e8851 100644 --- a/.github/workflows/handle-tag.yml +++ b/.github/workflows/handle-tag.yml @@ -3,7 +3,7 @@ name: Handle tag on: push: tags: - - '[0-9]+.[0-9]+.[0-9]+' + - '[0-9]+.[0-9]+.[0-9]+*' workflow_dispatch: jobs: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index fce47677..c246846f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -24,6 +24,17 @@ jobs: - uses: actions/checkout@v3 + - name: Verify release version and get just the numbers and the dots + id: get-number-version + run: | + [string]$numberVersion = .\GetNumberVersion -Version ${{ inputs.release-version }} + echo "Got version $numberVersion" + [bool]$prelease = $false + if ($numberVersion -eq ${{ inputs.release-version }}) { + $prelease = $True + } + echo "PRELEASE=$prerelease" >> $env:GITHUB_ENV + - name: Get cached build id: get-cached-build uses: actions/cache@v3.0.5 @@ -80,7 +91,8 @@ jobs: Start-Sleep 1 gh release upload ${{ env.RELEASE_VERSION }} $env:ZipFilename $env:NupkgFilename - - name: Publish to Chocolatey + - name: Publish to Chocolatey if not prerelease + if: ${{ ! env.prerelease }} env: CHOCO_TOKEN: ${{ secrets.CHOCO_TOKEN }} run: | diff --git a/GetNumberVersion.ps1 b/GetNumberVersion.ps1 new file mode 100644 index 00000000..fd1e3a30 --- /dev/null +++ b/GetNumberVersion.ps1 @@ -0,0 +1,20 @@ +# Verify it is a proper version +param( + [Parameter(Mandatory=$false)] + [string] + $Version +) + +Set-StrictMode -Version 3 + +if ($Version -match "^\d+\.\d+\.\d+$") { + return $Version +} + +if (-not ($Version -match "^\d+\.\d+\.\d+-.{1,12}$")) { + throw "The version must start with three numbers separated by dots. This may be " + ` + "followed by a '-' and a word. That word may not be longer than 12 characters. For instance, 4.3.22-beta." +} + +$parts = $Version -split "-" +return $parts[0] From f6ab3de05f01a80954b9cba096be375c1b676f2d Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 15:35:34 +0100 Subject: [PATCH 03/14] Loosening SetVersion --- SetVersion.ps1 | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/SetVersion.ps1 b/SetVersion.ps1 index 3789722a..e7d2c4e9 100644 --- a/SetVersion.ps1 +++ b/SetVersion.ps1 @@ -1,15 +1,21 @@ param( - [Parameter(Mandatory)] + [Parameter(Mandatory)] [string] - $FileName, + $FileName, - [Parameter(Mandatory)] - [string] - $PropertyName, + [Parameter(Mandatory)] + [string] + $PropertyName, - [Parameter(Mandatory)] + [Parameter(Mandatory, + ParameterSetName = 'Version')] [Version] - $Version + $Version, + + [Parameter(Mandatory, + ParameterSetName = 'VersionString')] + [string] + $VersionString ) Set-StrictMode -Version 2 @@ -17,20 +23,22 @@ Set-StrictMode -Version 2 $pattern = "^\[assembly: $PropertyName\(""(.*)""\)\]$" $found = $false +if ($Version) { + $VersionString = $Version +} + $content = (Get-Content $fileName -Encoding UTF8) | ForEach-Object { - if ($_ -match $pattern) - { - "[assembly: $PropertyName(""{0}"")]" -f $Version - $found = $true + if ($_ -match $pattern) { + "[assembly: $PropertyName(""{0}"")]" -f $VersionString + $found = $true } - else - { + else { $_ } } if (-not $found) { - $content += "[assembly: $PropertyName(""{0}"")]" -f $Version + $content += "[assembly: $PropertyName(""{0}"")]" -f $VersionString } $content | Set-Content $fileName -Encoding UTF8 \ No newline at end of file From dd057307a57789ee6f2736e3fbca0948995e49db Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 16:38:44 +0100 Subject: [PATCH 04/14] Use versionstring --- .github/workflows/build-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index aebb695d..febeed0a 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -62,15 +62,15 @@ jobs: $sbeFileName = "$env:GITHUB_WORKSPACE\src\ServiceBusExplorer\Properties\AssemblyInfo.cs" .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyVersion' -Version ${{env.NUMBER_VERSION}} .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyFileVersion' -Version ${{env.NUMBER_VERSION}} - .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyInformationalVersion' -Version ${{env.ReleaseVersion}} + .\SetVersion -FileName $sbeFileName -PropertyName 'AssemblyInformationalVersion' -VersionString ${{env.ReleaseVersion}} $commonInfoFile = "$env:GITHUB_WORKSPACE\src\Common\Properties\AssemblyInfo.cs" .\SetVersion -FileName $commonInfoFile -PropertyName 'AssemblyFileVersion' -Version ${{env.NUMBER_VERSION}} - .\SetVersion -FileName $commonInfoFile -PropertyName 'AssemblyInformationalVersion' -Version ${{env.ReleaseVersion}} + .\SetVersion -FileName $commonInfoFile -PropertyName 'AssemblyInformationalVersion' -VersionString ${{env.ReleaseVersion}} $notificationHubsInfoFile = "$env:GITHUB_WORKSPACE\src\NotificationHubs\Properties\AssemblyInfo.cs" .\SetVersion -FileName $notificationHubsInfoFile -PropertyName 'AssemblyFileVersion' -Version ${{env.NUMBER_VERSION}} - .\SetVersion -FileName $notificationHubsInfoFile -PropertyName 'AssemblyInformationalVersion' -Version ${{env.ReleaseVersion}} + .\SetVersion -FileName $notificationHubsInfoFile -PropertyName 'AssemblyInformationalVersion' -VersionString ${{env.ReleaseVersion}} - name: Build # env: From fc6dc773a9d2f0084fe1e186063e427c6c9068d5 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 17:14:25 +0100 Subject: [PATCH 05/14] Version --- .github/workflows/build-test.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index febeed0a..60a8bb04 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -76,7 +76,7 @@ jobs: # env: # Version: ${{ inputs.release-version }} run: | - msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.NUMBER_VERSION}} ${{env.SOLUTION_FILE_PATH}} + msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.NUMBER_VERSION}}, InformationalVersion=${{inputs.release-version}} ${{env.SOLUTION_FILE_PATH}} - name: Run tests run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c246846f..cd523ae5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,7 +27,7 @@ jobs: - name: Verify release version and get just the numbers and the dots id: get-number-version run: | - [string]$numberVersion = .\GetNumberVersion -Version ${{ inputs.release-version }} + [Version]$numberVersion = .\GetNumberVersion -Version ${{ inputs.release-version }} echo "Got version $numberVersion" [bool]$prelease = $false if ($numberVersion -eq ${{ inputs.release-version }}) { From c7a23ac13fa285cf0e80552d76194b8d16117842 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 17:50:52 +0100 Subject: [PATCH 06/14] Update build-test.yml --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 60a8bb04..bf7da3ab 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -76,7 +76,7 @@ jobs: # env: # Version: ${{ inputs.release-version }} run: | - msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.NUMBER_VERSION}}, InformationalVersion=${{inputs.release-version}} ${{env.SOLUTION_FILE_PATH}} + msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.NUMBER_VERSION}},InformationalVersion=${{inputs.release-version}} ${{env.SOLUTION_FILE_PATH}} - name: Run tests run: | From 8b46411cd7db606e885076b2da429674f9e6944c Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 18:21:04 +0100 Subject: [PATCH 07/14] Update publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cd523ae5..3d767602 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -30,7 +30,7 @@ jobs: [Version]$numberVersion = .\GetNumberVersion -Version ${{ inputs.release-version }} echo "Got version $numberVersion" [bool]$prelease = $false - if ($numberVersion -eq ${{ inputs.release-version }}) { + if ("$numberVersion" -eq "${{ inputs.release-version }}") { $prelease = $True } echo "PRELEASE=$prerelease" >> $env:GITHUB_ENV From aacbd3321239798850698f48965c383229de1dc5 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 19:17:40 +0100 Subject: [PATCH 08/14] Update publish.yml --- .github/workflows/publish.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3d767602..44074f37 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -29,11 +29,13 @@ jobs: run: | [Version]$numberVersion = .\GetNumberVersion -Version ${{ inputs.release-version }} echo "Got version $numberVersion" - [bool]$prelease = $false + [bool]$prerelease = $true + if ("$numberVersion" -eq "${{ inputs.release-version }}") { - $prelease = $True + $prerelease = $false } - echo "PRELEASE=$prerelease" >> $env:GITHUB_ENV + + echo "PRERELEASE=$prerelease" >> $env:GITHUB_ENV - name: Get cached build id: get-cached-build From 6139abd576feae6f8981510d67600a6743c058ae Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 20:40:09 +0100 Subject: [PATCH 09/14] Add debug info --- .github/workflows/publish.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 44074f37..4141f059 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -37,6 +37,14 @@ jobs: echo "PRERELEASE=$prerelease" >> $env:GITHUB_ENV + - name: Dump env + run: env | sort + + - name: Dump GitHub context + env: + GITHUB_CONTEXT: ${{ toJson(github) }} + run: echo "$GITHUB_CONTEXT" + - name: Get cached build id: get-cached-build uses: actions/cache@v3.0.5 @@ -94,7 +102,7 @@ jobs: gh release upload ${{ env.RELEASE_VERSION }} $env:ZipFilename $env:NupkgFilename - name: Publish to Chocolatey if not prerelease - if: ${{ ! env.prerelease }} + if: ${{ ! env.PRERELEASE }} env: CHOCO_TOKEN: ${{ secrets.CHOCO_TOKEN }} run: | From 81682603eb90d5b0ee24df3fd247f8c2031b08a4 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 20:54:04 +0100 Subject: [PATCH 10/14] Change expression --- .github/workflows/publish.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4141f059..6bc9a257 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -28,7 +28,6 @@ jobs: id: get-number-version run: | [Version]$numberVersion = .\GetNumberVersion -Version ${{ inputs.release-version }} - echo "Got version $numberVersion" [bool]$prerelease = $true if ("$numberVersion" -eq "${{ inputs.release-version }}") { @@ -37,14 +36,6 @@ jobs: echo "PRERELEASE=$prerelease" >> $env:GITHUB_ENV - - name: Dump env - run: env | sort - - - name: Dump GitHub context - env: - GITHUB_CONTEXT: ${{ toJson(github) }} - run: echo "$GITHUB_CONTEXT" - - name: Get cached build id: get-cached-build uses: actions/cache@v3.0.5 @@ -102,7 +93,7 @@ jobs: gh release upload ${{ env.RELEASE_VERSION }} $env:ZipFilename $env:NupkgFilename - name: Publish to Chocolatey if not prerelease - if: ${{ ! env.PRERELEASE }} + if: ${{ env.PRERELEASE == 'FALSE' }} env: CHOCO_TOKEN: ${{ secrets.CHOCO_TOKEN }} run: | From fee3aed028127244f3476d9d03bed595fe5a602e Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 21:12:05 +0100 Subject: [PATCH 11/14] Update cache --- .github/workflows/build-test.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bf7da3ab..3f562e29 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -86,7 +86,7 @@ jobs: if ($process.ExitCode -ne 0) {throw "Unit tests failed (exit code = $($process.ExitCode))" } - name: Cache build - uses: actions/cache@v3.0.5 + uses: actions/cache@v3.0.11 if: ${{ inputs.cache-build }} with: path: src/ServiceBusExplorer/bin/Release diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6bc9a257..5905b417 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,7 +38,7 @@ jobs: - name: Get cached build id: get-cached-build - uses: actions/cache@v3.0.5 + uses: actions/cache@v3.0.11 with: path: src/ServiceBusExplorer/bin/Release key: cached-output-${{ github.sha }} From 10c03a4126bc5cffcf2641971d0ec667cd1bd3dd Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Wed, 2 Nov 2022 21:28:44 +0100 Subject: [PATCH 12/14] Cleanup --- .github/workflows/build-test.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 3f562e29..1a2331be 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -46,8 +46,7 @@ jobs: - name: Show version run: echo "Building version ${{ inputs.release-version }}" - - name: Get digital version - id: get-digital-version + - name: Get number version env: ReleaseVersion: ${{ inputs.release-version }} run: | @@ -73,8 +72,6 @@ jobs: .\SetVersion -FileName $notificationHubsInfoFile -PropertyName 'AssemblyInformationalVersion' -VersionString ${{env.ReleaseVersion}} - name: Build - # env: - # Version: ${{ inputs.release-version }} run: | msbuild /m /property:Configuration=${{env.BUILD_CONFIGURATION}},FileVersion=${{env.NUMBER_VERSION}},InformationalVersion=${{inputs.release-version}} ${{env.SOLUTION_FILE_PATH}} From cdd195a0e0fa408787927baee68f4363e9cc9a7e Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Thu, 3 Nov 2022 21:20:43 +0100 Subject: [PATCH 13/14] Updated to semver 2 (cherry picked from commit e730e107bd1269c5ee5f36ac87f5e317b30c3d80) --- GetNumberVersion.ps1 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/GetNumberVersion.ps1 b/GetNumberVersion.ps1 index fd1e3a30..bcae5479 100644 --- a/GetNumberVersion.ps1 +++ b/GetNumberVersion.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$false)] [string] - $Version + $Version = '0.0.0' ) Set-StrictMode -Version 3 @@ -11,10 +11,14 @@ if ($Version -match "^\d+\.\d+\.\d+$") { return $Version } -if (-not ($Version -match "^\d+\.\d+\.\d+-.{1,12}$")) { - throw "The version must start with three numbers separated by dots. This may be " + ` - "followed by a '-' and a word. That word may not be longer than 12 characters. For instance, 4.3.22-beta." +# RegEx from https://semver.org/ +[string]$semanticRegEx = '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$' + +if (-not ($Version -match $semanticRegEx)) { + throw "The version must follow semantic versioning, see https://semver.org/." + ` + " For instance 4.3.22-beta." } -$parts = $Version -split "-" +$parts = $Version -split {$_ -eq '-' -or $_ -eq '+'} + return $parts[0] From 427e5001c9875b7aa361770ba78cef757c9a7c38 Mon Sep 17 00:00:00 2001 From: Erik Mogensen Date: Tue, 8 Nov 2022 18:15:28 +0100 Subject: [PATCH 14/14] Minor cleanup --- GetNumberVersion.ps1 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/GetNumberVersion.ps1 b/GetNumberVersion.ps1 index bcae5479..e8def152 100644 --- a/GetNumberVersion.ps1 +++ b/GetNumberVersion.ps1 @@ -2,15 +2,11 @@ param( [Parameter(Mandatory=$false)] [string] - $Version = '0.0.0' + $Version ) Set-StrictMode -Version 3 -if ($Version -match "^\d+\.\d+\.\d+$") { - return $Version -} - # RegEx from https://semver.org/ [string]$semanticRegEx = '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$'