Skip to content

Commit 1106dbd

Browse files
Merge changes from #657, #792, #782
(cherry picked from commit 238ce5f)
1 parent 5a82dd5 commit 1106dbd

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

.github/workflows/Build.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ jobs:
7777
}
7878
}
7979
80-
$GetFileVersionOutput = dotnet msbuild dotnet/Directory.Build.props /t:GetFileVersionForPackage
80+
$COMMIT_NUMBER = @($(git rev-list --count origin/master..), $(git rev-list --count HEAD))[$IsPrerelease]
81+
$COMMIT_MESSAGE = $(git log -1 --pretty=%B)
82+
$LAST_COMMITTER = $(git log -1 --pretty=format:%an)
83+
84+
$GetFileVersionOutput = dotnet msbuild dotnet/Directory.Build.props /t:GetFileVersionForPackage /p:COMMIT_NUMBER=$COMMIT_NUMBER
8185
"$GetFileVersionOutput" -match "(?<=FileVersion:)(.*)" > $null
8286
$GetFileVersionOutput = $Matches[0]
8387
@@ -91,17 +95,14 @@ jobs:
9195
9296
Write-Output "Packge version to be used: $NUGET_PACKAGE_VERSION"
9397
94-
$COMMIT_NUMBER = @($(git rev-list --count origin/master..), $(git rev-list --count HEAD))[$IsPrerelease]
95-
$COMMIT_MESSAGE = $(git log -1 --pretty=%B)
96-
$LAST_COMMITTER = $(git log -1 --pretty=format:%an)
97-
9898
echo "NUGET_PACKAGE_VERSION=$NUGET_PACKAGE_VERSION" >> $env:GITHUB_ENV
99+
echo "COMMIT_NUMBER=$COMMIT_NUMBER" >> $env:GITHUB_ENV
99100
echo "IsPrerelease=$IsPrerelease" >> $env:GITHUB_ENV
100101
101-
echo "::set-output name=NUGET_PACKAGE_VERSION::$NUGET_PACKAGE_VERSION"
102-
echo "::set-output name=SHOULD_DEPLOY::$SHOULD_DEPLOY"
103-
echo "::set-output name=LAST_COMMITTER::$LAST_COMMITTER"
104-
echo "::set-output name=COMMIT_MESSAGE::$COMMIT_MESSAGE"
102+
echo "NUGET_PACKAGE_VERSION=$NUGET_PACKAGE_VERSION" >> $env:GITHUB_OUTPUT
103+
echo "SHOULD_DEPLOY=$SHOULD_DEPLOY" >> $env:GITHUB_OUTPUT
104+
echo "LAST_COMMITTER=$LAST_COMMITTER" >> $env:GITHUB_OUTPUT
105+
echo "COMMIT_MESSAGE=$COMMIT_MESSAGE" >> $env:GITHUB_OUTPUT
105106
106107
- name: Write SNK
107108
if: github.repository_owner == 'GeneXusLabs' && steps.buildVariables.outputs.SHOULD_DEPLOY == 'true'

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
jobs:
2525
analyze:
2626
name: Analyze
27-
runs-on: windows-latest
27+
runs-on: windows-2019
2828

2929
env:
3030
Configuration: Release

0 commit comments

Comments
 (0)