Merge pull request #247 from muno92/dotnet6

.NET6
muno92 · Jan 23, 2022 · e9c9b11 · e9c9b11
2 parents b48bb58 + 1afa872
commit e9c9b11
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 65 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,13 +21,13 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ ubuntu-latest, windows-latest, macOS-latest ]
-        dotnet-version: [ '3.1', '5.0' ]
+        dotnet-version: [ '3.1', '5.0', '6.0' ]
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: ${{ matrix.dotnet-version }}
       - uses: ./
         with:
-          solutionPath: TestSolutions/TestSolution${{ matrix.dotnet-version }}/TestSolution${{ matrix.dotnet-version }}.sln
+          solutionPath: TestSolution/TestSolution.sln
           failOnIssue: '0'
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '5.0.x' # or 3.1.x
+          dotnet-version: '6.0.x' # or 3.1.x, 5.0.x
       - name: Restore
         run: dotnet restore
       - name: Inspect code

diff --git a/...TestSolution5.0/TestConsoleApp/Program.cs → TestSolution/TestConsoleApp/Program.cs b/...TestSolution5.0/TestConsoleApp/Program.cs → TestSolution/TestConsoleApp/Program.cs
diff --git a/...n3.1/TestConsoleApp/TestConsoleApp.csproj → ...tion/TestConsoleApp/TestConsoleApp.csproj b/...n3.1/TestConsoleApp/TestConsoleApp.csproj → ...tion/TestConsoleApp/TestConsoleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/...tions/TestSolution3.1/TestSolution3.1.sln → TestSolution/TestSolution.sln b/...tions/TestSolution3.1/TestSolution3.1.sln → TestSolution/TestSolution.sln
diff --git a/TestSolutions/TestSolution3.1/TestConsoleApp/Program.cs b/TestSolutions/TestSolution3.1/TestConsoleApp/Program.cs
diff --git a/TestSolutions/TestSolution5.0/TestConsoleApp/TestConsoleApp.csproj b/TestSolutions/TestSolution5.0/TestConsoleApp/TestConsoleApp.csproj
diff --git a/TestSolutions/TestSolution5.0/TestSolution5.0.sln b/TestSolutions/TestSolution5.0/TestSolution5.0.sln
diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/actions/typescript-action.git"
+    "url": "git+https://github.com/muno92/resharper_inspectcode.git"
   },
   "keywords": [
     "actions",