From 38ab6626fc4264ded1d6d9c5fee315080371a3eb Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 11 Nov 2020 12:30:15 -0700 Subject: [PATCH 1/6] update PD Core to 1.0.43 --- packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages.config b/packages.config index 296413b6..c138dd1b 100644 --- a/packages.config +++ b/packages.config @@ -1,3 +1,3 @@ - + \ No newline at end of file From 4903b99eb5dfdaf20a83f2d23d175f60aabda0af Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 11 Nov 2020 12:38:50 -0700 Subject: [PATCH 2/6] fix main workflow --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 72720299..4fc492bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: shell: powershell env: TAG_NAME: ${{ github.event.release.tag_name }} - run: echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + run: echo "VERSION=$($Env:TAG_NAME)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append # Use the version number to set the version of the assemblies - name: Update AssemblyInfo.cs shell: powershell From 6557d21aa8c7c2b5c44dda831f1b311f6fea5c76 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 11 Nov 2020 14:41:58 -0700 Subject: [PATCH 3/6] change action to use master instead of v1 --- .github/workflows/docker.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 89e463ec..69ff9160 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -140,7 +140,7 @@ jobs: Get-ChildItem -Path .\output\* | Copy-Item -Destination .\ Remove-Item -Path .\output -Recurse - name: Add nuget.exe - uses: nuget/setup-nuget@v1 + uses: nuget/setup-nuget@master - name: Add Github Packages source run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.org API Key diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4fc492bf..9197437e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,7 +113,7 @@ jobs: Get-ChildItem -Path .\output\* | Copy-Item -Destination .\ Remove-Item -Path .\output -Recurse - name: Add nuget.exe - uses: nuget/setup-nuget@v1 + uses: nuget/setup-nuget@master - name: Add Github Packages source run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.org API Key From faa6e20034f098a148a158ad8dfc0c8e620aaea7 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 11 Nov 2020 15:45:50 -0700 Subject: [PATCH 4/6] specifying version for nuget action --- .github/workflows/docker.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 69ff9160..f97d642f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -140,7 +140,7 @@ jobs: Get-ChildItem -Path .\output\* | Copy-Item -Destination .\ Remove-Item -Path .\output -Recurse - name: Add nuget.exe - uses: nuget/setup-nuget@master + uses: nuget/setup-nuget@v1.0.2 - name: Add Github Packages source run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.org API Key diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9197437e..c68425b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,7 +113,7 @@ jobs: Get-ChildItem -Path .\output\* | Copy-Item -Destination .\ Remove-Item -Path .\output -Recurse - name: Add nuget.exe - uses: nuget/setup-nuget@master + uses: nuget/setup-nuget@v1.0.2 - name: Add Github Packages source run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.org API Key From 5b889ea59c2e2913c795c92beffea92902691fda Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Wed, 11 Nov 2020 16:36:56 -0700 Subject: [PATCH 5/6] back to original version --- .github/workflows/docker.yml | 2 +- .github/workflows/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f97d642f..89e463ec 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -140,7 +140,7 @@ jobs: Get-ChildItem -Path .\output\* | Copy-Item -Destination .\ Remove-Item -Path .\output -Recurse - name: Add nuget.exe - uses: nuget/setup-nuget@v1.0.2 + uses: nuget/setup-nuget@v1 - name: Add Github Packages source run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.org API Key diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c68425b8..4fc492bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -113,7 +113,7 @@ jobs: Get-ChildItem -Path .\output\* | Copy-Item -Destination .\ Remove-Item -Path .\output -Recurse - name: Add nuget.exe - uses: nuget/setup-nuget@v1.0.2 + uses: nuget/setup-nuget@v1 - name: Add Github Packages source run: nuget sources add -name github -source https://nuget.pkg.github.com/pepperdash/index.json -username Pepperdash -password ${{ secrets.GITHUB_TOKEN }} - name: Add nuget.org API Key From 5a3597f2a73efbebc012dcd98b827aa5a494f8b2 Mon Sep 17 00:00:00 2001 From: Andrew Welker Date: Thu, 12 Nov 2020 08:28:19 -0700 Subject: [PATCH 6/6] minor change to generate new build number --- .github/workflows/docker.yml | 1 - .github/workflows/main.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 89e463ec..003b1f66 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -45,7 +45,6 @@ jobs: - name: Update AssemblyInfo.cs shell: powershell run: | - Write-Output ${{ env.VERSION }} ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }} - name: restore Nuget Packages run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4fc492bf..f1a6a278 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,6 @@ jobs: - name: Update AssemblyInfo.cs shell: powershell run: | - Write-Output ${{ env.VERSION }} ./.github/scripts/UpdateAssemblyVersion.ps1 ${{ env.VERSION }} - name: restore Nuget Packages run: nuget install .\packages.config -OutputDirectory .\packages -ExcludeVersion