From a0c1840b129ec2bcc0b08a21052e1ebda4687eb8 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Mon, 25 Nov 2024 13:29:23 +0100 Subject: [PATCH 01/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 0a48f90..2a384ad 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -40,7 +40,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up MSBuild - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - shell: powershell run: | $tags = git tag --sort=-creatordate @@ -51,10 +51,6 @@ jobs: run: '((Get-Content -path ./Ocaramba.Templates.VSIX/source.extension.vsixmanifest -Raw) -replace ''Version="\d\.\d.\d" Language'',''Version="$(templateVersion)" Language'') | Set-Content -Path ./Ocaramba.Templates.VSIX/source.extension.vsixmanifest' - shell: powershell run: ./setPackagesVersions.ps1 - - name: Setup nuget - uses: nuget/setup-nuget@v2 - with: - nuget-version: latest - name: Set project versions id: update uses: vers-one/dotnet-project-version-updater@v1.4 From f2f6206c4704a41ca0f797a071e9a3983181fdb7 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Mon, 25 Nov 2024 13:46:51 +0100 Subject: [PATCH 02/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01f4368..f8efbe0 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ All templates are located on Visual Studio's **New Project** and **New Item** wi *Find out more on [Ocaramba](https://github.com/ObjectivityLtd/Ocaramba).* -[![Build Status](https://dev.azure.com/ocaramba/Ocaramba.templates/_apis/build/status/ObjectivityLtd.Ocaramba.templates)](https://dev.azure.com/ocaramba/Ocaramba.templates/_build?definitionId=1&_a=summary) +![Build status](https://github.com/Accenture/Ocaramba/actions/workflows/github-actions.yml/badge.svg) Download Ocaramba Visual Studio templates [![Ocaramba Templates](https://img.shields.io/badge/get-Ocaramba_Templates-green.svg?color=4BC21F)](https://marketplace.visualstudio.com/items?itemName=Ocaramba.Ocaramba1) From bd11ba50fa8ca657af8eaade06d915a5bfed2f13 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Mon, 25 Nov 2024 13:48:54 +0100 Subject: [PATCH 03/13] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f8efbe0..10c63bb 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ The extension contains: - Project templates: - Ocaramba.MsTest (.NET Framework 4.7.2) - - Ocaramba.MsTest (.NET Core 3.1) - - Ocaramba.NUnit (.NET Core 3.1) + - Ocaramba.MsTest (.NET 8.0) + - Ocaramba.NUnit (.NET 8.0) - Ocaramba.NUnit (.NET Framework 4.7.2) - Item templates: - Ocaramba Page Object From be9bd598dc75688a2d32d177212ee3a04af2439d Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Mon, 25 Nov 2024 13:49:23 +0100 Subject: [PATCH 04/13] Update ProjectTemplate.csproj --- Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj b/Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj index 11d26e8..ac5a240 100644 --- a/Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj +++ b/Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 false From 341227f0cc626267c21eba999e4e1827954cbded Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Mon, 25 Nov 2024 13:50:00 +0100 Subject: [PATCH 05/13] Update ProjectTemplate.csproj --- Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj b/Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj index 4ebccad..d5841ed 100644 --- a/Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj +++ b/Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 false From 7fa89ac2a1128dd0bf60dfd70444a41ae029f38f Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Mon, 25 Nov 2024 13:57:12 +0100 Subject: [PATCH 06/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 2a384ad..03724fd 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -64,3 +64,23 @@ jobs: with: path: ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix name: Template + - name: Create GitHub Release + id: create_release + uses: actions/create-release@v1 + with: + tag_name: ${{ env.templateVersion}} + release_name: Version ${{ env.templateVersion }} + body: | + Changes in this release: + - List your changes here + draft: false + prerelease: false + if: startsWith(github.ref, 'refs/tags/') + - name: Upload Release Asset + uses: actions/upload-release-asset@v1 + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix + asset_name: Ocaramba.Templates.vsix + asset_content_type: application/octet-stream + if: startsWith(github.ref, 'refs/tags/') From 1909b5ae33c9b1bf3f4c4b20d714bdaf3c67e510 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 08:36:27 +0100 Subject: [PATCH 07/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 03724fd..3c05ce5 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -48,7 +48,7 @@ jobs: Write-Host "##vso[task.setvariable variable=frameworkVersion]$tag" if: startsWith(github.ref, 'refs/tags/') - shell: powershell - run: '((Get-Content -path ./Ocaramba.Templates.VSIX/source.extension.vsixmanifest -Raw) -replace ''Version="\d\.\d.\d" Language'',''Version="$(templateVersion)" Language'') | Set-Content -Path ./Ocaramba.Templates.VSIX/source.extension.vsixmanifest' + run: '((Get-Content -path ./Ocaramba.Templates.VSIX/source.extension.vsixmanifest -Raw) -replace ''Version="\d\.\d.\d" Language'',''Version="${{ env.templateVersion }}" Language'') | Set-Content -Path ./Ocaramba.Templates.VSIX/source.extension.vsixmanifest' - shell: powershell run: ./setPackagesVersions.ps1 - name: Set project versions From f4ce9b1a0e0a1acd5c7944b6d57f14108620bcaf Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 08:57:46 +0100 Subject: [PATCH 08/13] Update packages.config --- Ocaramba.ProjectExample.NUnit.NetFramework/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ocaramba.ProjectExample.NUnit.NetFramework/packages.config b/Ocaramba.ProjectExample.NUnit.NetFramework/packages.config index b6c6328..eba9fdb 100644 --- a/Ocaramba.ProjectExample.NUnit.NetFramework/packages.config +++ b/Ocaramba.ProjectExample.NUnit.NetFramework/packages.config @@ -1,7 +1,7 @@  - + From 7f019e2e0b33f81168e49212cff79ff39469d85c Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 09:53:15 +0100 Subject: [PATCH 09/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 3c05ce5..e618ecf 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -75,6 +75,8 @@ jobs: - List your changes here draft: false prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: startsWith(github.ref, 'refs/tags/') - name: Upload Release Asset uses: actions/upload-release-asset@v1 From 1379e5e308c655516a7cf4d382c1935e757a0b55 Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 10:03:07 +0100 Subject: [PATCH 10/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index e618ecf..90fe0af 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -64,20 +64,6 @@ jobs: with: path: ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix name: Template - - name: Create GitHub Release - id: create_release - uses: actions/create-release@v1 - with: - tag_name: ${{ env.templateVersion}} - release_name: Version ${{ env.templateVersion }} - body: | - Changes in this release: - - List your changes here - draft: false - prerelease: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - if: startsWith(github.ref, 'refs/tags/') - name: Upload Release Asset uses: actions/upload-release-asset@v1 with: From 2025f4a48f13e96a64b85c0a16822aa54965159f Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 10:13:03 +0100 Subject: [PATCH 11/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 90fe0af..18b0987 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -64,11 +64,8 @@ jobs: with: path: ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix name: Template - - name: Upload Release Asset - uses: actions/upload-release-asset@v1 - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix - asset_name: Ocaramba.Templates.vsix - asset_content_type: application/octet-stream if: startsWith(github.ref, 'refs/tags/') + - name: 'Ocaramba Templates' + run: gh release upload ${{github.event.release.tag_name}} ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 813c074476e852b07097fcd659848f5968da639e Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 10:13:50 +0100 Subject: [PATCH 12/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 18b0987..d7067d5 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -60,12 +60,8 @@ jobs: version: ${{ env.templateVersion }} - run: msbuild -t:Restore /p:configuration='${{ env.buildConfiguration }}' /v:minimal - run: msbuild '${{ env.solution }}' /p:configuration='${{ env.buildConfiguration }}' /p:platform='${{ env.buildPlatform }}' /v:minimal - - uses: actions/upload-artifact@v4 - with: - path: ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix - name: Template - if: startsWith(github.ref, 'refs/tags/') - name: 'Ocaramba Templates' run: gh release upload ${{github.event.release.tag_name}} ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: startsWith(github.ref, 'refs/tags/') From bc9a4ba937f162fe08d6411bf3650970b841fa0b Mon Sep 17 00:00:00 2001 From: Jakub Raczek Date: Tue, 26 Nov 2024 10:25:37 +0100 Subject: [PATCH 13/13] Update dotnet-desktop.yml --- .github/workflows/dotnet-desktop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index d7067d5..ef99eb1 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -61,7 +61,7 @@ jobs: - run: msbuild -t:Restore /p:configuration='${{ env.buildConfiguration }}' /v:minimal - run: msbuild '${{ env.solution }}' /p:configuration='${{ env.buildConfiguration }}' /p:platform='${{ env.buildPlatform }}' /v:minimal - name: 'Ocaramba Templates' - run: gh release upload ${{github.event.release.tag_name}} ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix + run: gh release upload ${{ env.templateVersion }} ./Ocaramba.Templates.VSIX/bin/Release/Ocaramba.Templates.vsix env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} if: startsWith(github.ref, 'refs/tags/')