Skip to content

Commit

Permalink
Merge branch 'fixNetFramework' of https://github.com/Accenture/Ocaram…
Browse files Browse the repository at this point in the history
…ba.templates into fixNetFramework
  • Loading branch information
jraczek-acc committed Dec 3, 2024
2 parents 92f012f + 38af04e commit bb89e90
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/dotnet-desktop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ env:
templateVersion: 2.0.6
OcarambaVersion: 4.2.0

SeleniumWebDriverVersion: 4.4.0
SeleniumSupportVersion: 4.4.0
SeleniumWebDriverVersion: 4.27.0
SeleniumSupportVersion: 4.27.0

SeleniumWebdriverChromeDriverVersion: 131.0.6778.8500
SeleniumWebDriverGeckoDriverVersion: 0.35.0
SeleniumWebDriverIEDriverVersion: 4.14.0

NUnitVersion: 3.13.3
NUnitVersion: 4.2.2
NUnit3TestAdapterVersion: 4.6.0

MicrosoftNetTestSdkVersion: 17.12.0
Expand All @@ -52,7 +52,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: Setup nuget
Expand All @@ -64,7 +64,7 @@ jobs:
uses: vers-one/dotnet-project-version-updater@v1.4
with:
file: |
"**/Ocaramba**.csproj"
"**/Ocaramba**.csproj",
"!**/Ocaramba.Templates.csproj"
version: ${{ env.templateVersion }}
- run: msbuild -t:Restore /p:configuration='${{ env.buildConfiguration }}' /v:minimal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
Expand Down
2 changes: 1 addition & 1 deletion Ocaramba.ProjectExample.NUnit.NetFramework/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="$NLog-version$" />
<package id="NPOI" version="$NPOI-version$" />
<package id="NPOI" version="$NPOI-version$" targetFramework="net472"/>
<package id="NUnit" version="$NUnit-version$" />
<package id="NUnit3TestAdapter" version="$NUnit3TestAdapter-version$" targetFramework="net472"/>
<package id="OcarambaLite" version="$Ocaramba-version$" targetFramework="net472"/>
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)

Expand Down

0 comments on commit bb89e90

Please sign in to comment.