From 0291051c4658732f6698f61f1d0da0f966624c4e Mon Sep 17 00:00:00 2001 From: Simon Novak Date: Mon, 13 May 2024 19:59:07 +0200 Subject: [PATCH] fix(#5): Fix git versioning --- .github/workflows/release.yml | 6 ------ Directory.Build.props | 4 ++++ Directory.Packages.props | 1 + GitVersion.yml | 4 +++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5658064..e93487b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,12 +38,6 @@ jobs: - name: Restore .NET Packages run: dotnet restore - - name: Determine Version - uses: gittools/actions/gitversion/execute@v1.1.1 - with: - updateAssemblyInfo: true - useConfigFile: true - - name: Build .NET Solution run: dotnet build --configuration Release --no-restore diff --git a/Directory.Build.props b/Directory.Build.props index b05a28b..85d8219 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -6,6 +6,10 @@ https://github.com/InfinityFlowApp/tools-nuget-branding + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Directory.Packages.props b/Directory.Packages.props index 4199017..839166d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,6 +3,7 @@ true + diff --git a/GitVersion.yml b/GitVersion.yml index 403b71c..7cf553d 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,6 @@ +mode: ContinuousDeployment branches: master: - mode: ContinuousDeployment tag: rc + pull-request: + tag: pr