diff --git a/ci/GitVersion.yml b/ci/GitVersion.yml index a374f41..0458d7b 100644 --- a/ci/GitVersion.yml +++ b/ci/GitVersion.yml @@ -1,7 +1,8 @@ workflow: 'GitHubFlow/v1' +next-version: '5.0.6' branches: main: - mode: ContinuousDeployment + mode: ContinuousDelivery label: 'beta' increment: Patch track-merge-target: false @@ -9,6 +10,7 @@ branches: regex: ^master$|^main$ is-release-branch: true is-main-branch: true + prevent-increment-of-merged-branch-version: true develop: label: 'beta' increment: None diff --git a/ci/package.yml b/ci/package.yml index 2d07471..0c419f7 100644 --- a/ci/package.yml +++ b/ci/package.yml @@ -17,7 +17,7 @@ steps: inputs: command: 'publish' publishWebProjects: false - projects: 'src/Console/Console.csproj' + projects: 'src/ACUConsole/ACUConsole.csproj' arguments: '-r osx-arm64 --configuration $(BuildConfiguration) /p:PublishSingleFile=true /p:IncludeAllContentForSelfExtract=true --self-contained true --output $(Build.ArtifactStagingDirectory)/TestConsole/osx-arm64 /p:Version=$(GitVersionAssembly)' zipAfterPublish: false modifyOutputPath: false @@ -29,7 +29,7 @@ steps: publishWebProjects: false zipAfterPublish: false modifyOutputPath: false - projects: 'src/Console/Console.csproj' + projects: 'src/ACUConsole/ACUConsole.csproj' arguments: '-r win-x64 --configuration $(BuildConfiguration) /p:PublishSingleFile=true /p:IncludeAllContentForSelfExtract=true --self-contained true --output $(Build.ArtifactStagingDirectory)/TestConsole/win-x64 /p:Version=$(GitVersionAssembly)' - task: DotNetCoreCLI@2 @@ -39,7 +39,7 @@ steps: publishWebProjects: false zipAfterPublish: false modifyOutputPath: false - projects: 'src/Console/Console.csproj' + projects: 'src/ACUConsole/ACUConsole.csproj' arguments: '-r linux-x64 --configuration $(BuildConfiguration) /p:PublishSingleFile=true /p:IncludeAllContentForSelfExtract=true --self-contained true --output $(Build.ArtifactStagingDirectory)/TestConsole/linux-x64 /p:Version=$(GitVersionAssembly)' - task: DotNetCoreCLI@2 @@ -49,7 +49,7 @@ steps: publishWebProjects: false zipAfterPublish: false modifyOutputPath: false - projects: 'src/Console/Console.csproj' + projects: 'src/ACUConsole/ACUConsole.csproj' arguments: '-r linux-arm64 --configuration $(BuildConfiguration) --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:IncludeAllContentForSelfExtract=true --output $(Build.ArtifactStagingDirectory)/TestConsole/linux-arm64 /p:Version=$(GitVersionAssembly)' - task: ArchiveFiles@2