diff --git a/Confuser2.sln b/Confuser2.sln index c5a080fdd..625da6ba4 100644 --- a/Confuser2.sln +++ b/Confuser2.sln @@ -33,6 +33,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution global.json = global.json LICENSE.md = LICENSE.md README.md = README.md + version.json = version.json EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.UnitTest", "Tests\Confuser.UnitTest\Confuser.UnitTest.csproj", "{73226E13-1701-424E-A4F2-3E4D575A1DD0}" @@ -63,7 +64,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "78_SignatureMismatch", "Tes EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "78_SignatureMismatch.Test", "Tests\78_SignatureMismatch.Test\78_SignatureMismatch.Test.csproj", "{8489A9CE-AB1A-4D8D-8824-D9E18B9945FE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Confuser.Core.Test", "Tests\Confuser.Core.Test\Confuser.Core.Test.csproj", "{055BC73F-FCAE-4361-B035-2E156A101EA9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Confuser.Core.Test", "Tests\Confuser.Core.Test\Confuser.Core.Test.csproj", "{055BC73F-FCAE-4361-B035-2E156A101EA9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/version.json b/version.json index c89f8d7a4..548e32101 100644 --- a/version.json +++ b/version.json @@ -1,21 +1,21 @@ { - "version": "1.3.0-alpha.{height}", - "nugetPackageVersion": { - "semVer": 1 - }, - "semVer1NumericIdentifierPadding": 4, - "publicReleaseRefSpec": [ - "^refs/heads/release", - "^refs/tags/v\\d+\\.\\d+(?:\\.\\d+)?" - ], - "cloudBuild": { - "setVersionVariables": true, - "buildNumber": { - "enabled": false, - "includeCommitId": { - "when": "nonPublicReleaseOnly", - "where": "buildMetadata" - } - } - } -} \ No newline at end of file + "version": "1.3.0+{height}", + "nugetPackageVersion": { + "semVer": 1 + }, + "semVer1NumericIdentifierPadding": 4, + "publicReleaseRefSpec": [ + "^refs/heads/master$", + "^refs/tags/v\\d+\\.\\d+" + ], + "cloudBuild": { + "setVersionVariables": true, + "buildNumber": { + "enabled": false, + "includeCommitId": { + "when": "nonPublicReleaseOnly", + "where": "buildMetadata" + } + } + } +}