diff --git a/.github/workflows/cd-release-preview.yml b/.github/workflows/cd-release-preview.yml index b2628ea..02102ef 100644 --- a/.github/workflows/cd-release-preview.yml +++ b/.github/workflows/cd-release-preview.yml @@ -3,7 +3,7 @@ name: "2. Continuous Deployment (Release Preview)" on: push: tags: - - "v[0-9]+\\.[0-9]+\\.[0-9]+-preview.*" + - "v[0-9]+\\.[0-9]+\\.[0-9]+-preview*" jobs: build: diff --git a/CryptoNet.ConsumerTest/CryptoNet.ConsumerTest.csproj b/CryptoNet.ConsumerTest/CryptoNet.ConsumerTest.csproj index 7bba534..a056e3c 100644 --- a/CryptoNet.ConsumerTest/CryptoNet.ConsumerTest.csproj +++ b/CryptoNet.ConsumerTest/CryptoNet.ConsumerTest.csproj @@ -8,7 +8,7 @@ - + diff --git a/CryptoNet.ExtPack/CryptoNet.ExtPack.csproj b/CryptoNet.ExtPack/CryptoNet.ExtPack.csproj index d9d7b74..5b1df01 100644 --- a/CryptoNet.ExtPack/CryptoNet.ExtPack.csproj +++ b/CryptoNet.ExtPack/CryptoNet.ExtPack.csproj @@ -17,7 +17,6 @@ itbackyard Maytham Fahmi 1.0.0 - 3.0.0 CryptoNet.ExtPack CryptoNet.ExtPack CryptoNet.ExtPack diff --git a/CryptoNet.sln b/CryptoNet.sln index 048fa2b..de449c6 100644 --- a/CryptoNet.sln +++ b/CryptoNet.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.1.32407.343 +# Visual Studio Version 18 +VisualStudioVersion = 18.3.11222.16 d18.3 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CryptoNet", "CryptoNet\CryptoNet.csproj", "{8F85375C-A0DC-4B67-B934-F58ED4114F5A}" EndProject @@ -16,11 +16,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DevOps", "DevOps", "{1733D1 .github\workflows\cd-release.yml = .github\workflows\cd-release.yml .github\workflows\ci.yml = .github\workflows\ci.yml .github\workflows\code-coverage.yml = .github\workflows\code-coverage.yml + Directory.Build.Props = Directory.Build.Props DockerBuild.ps1 = DockerBuild.ps1 Dockerfile = Dockerfile RELEASE-NOTES = RELEASE-NOTES run_codecoverage.ps1 = run_codecoverage.ps1 run_codecoverage.txt = run_codecoverage.txt + run_release.ps1 = run_release.ps1 EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Info", "Info", "{6976E2ED-A139-48C5-A390-639F56A8B348}" diff --git a/CryptoNet/CryptoNet.csproj b/CryptoNet/CryptoNet.csproj index c3dd509..26ab374 100644 --- a/CryptoNet/CryptoNet.csproj +++ b/CryptoNet/CryptoNet.csproj @@ -26,7 +26,9 @@ Copyright © 2020 true true + true embedded + snupkg true <_SkipUpgradeNetAnalyzersNuGetWarning>true true @@ -62,7 +64,7 @@ - + true diff --git a/Directory.Build.Props b/Directory.Build.Props index 2e6eb11..df58c20 100644 --- a/Directory.Build.Props +++ b/Directory.Build.Props @@ -3,9 +3,9 @@ Maytham Fahmi and Contributors All Rights Reserved - 3.2.0 - 3.2.0.0 - 3.2.0.0 + 3.2.5 + 3.2.5.0 + 3.2.5.0 diff --git a/run_release.ps1 b/run_release.ps1 index 0c7a714..bb368bb 100644 --- a/run_release.ps1 +++ b/run_release.ps1 @@ -14,14 +14,14 @@ if ($VersionNumber -notmatch '^\d+\.\d+\.\d+$') { } # Build preview suffix (valid SemVer identifiers, no leading zeros) -$DatePart = (Get-Date -Format "yyyyMMdd") # e.g. 20250822 -$TimePart = (Get-Date -Format "Hmm") # e.g. 845 (not 0845, no leading zero!) -$PreviewId = "$DatePart.$TimePart" # → "20250822.845" +$DatePart = (Get-Date -Format "yyyyMMdd") # e.g 20250822 +$TimePart = (Get-Date -Format "Hmm") # e.g 845 (not 0845, no leading zero!) +$PreviewId = "$DatePart$TimePart" # → "20250822845" (no dots!) # Construct the tag if ($IsPreview) { - # format: vX.Y.Z-preview.YYYYMMDD.HHmm - $TagName = "v$VersionNumber-preview.$PreviewId" + # format: vX.Y.Z-previewYYYYMMDDHHmm (NuGet-compliant) + $TagName = "v$VersionNumber-preview$PreviewId" } else { $TagName = "v$VersionNumber" }