Merge branch 'master' into fixNetFramework

Accenture · Dec 3, 2024 · 37d564e · 37d564e
2 parents a234fbb + bc9a4ba
commit 37d564e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -65,8 +65,7 @@ jobs:
       with:
         file: |
           "**/Ocaramba**.csproj",
-          "!**/Ocaramba.Templates.csproj",
-          "**/**.vsixmanifest"
+          "!**/Ocaramba.Templates.csproj"
         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

diff --git a/Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj b/Ocaramba.ProjectExample.MsTest.NetCore/ProjectTemplate.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj b/Ocaramba.ProjectExample.NUnit.NetCore/ProjectTemplate.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>

diff --git a/Ocaramba.ProjectExample.NUnit.NetFramework/packages.config b/Ocaramba.ProjectExample.NUnit.NetFramework/packages.config
@@ -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"/>

diff --git 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
@@ -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)