Retarget Projects to .NET 6 (#1)

* Add .NET 6 target to projects * Remove multi target * Revert unecessary change
criticalmanufacturing · Nov 12, 2021 · be1e04e · be1e04e
1 parent fb38917
commit be1e04e
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 6.x
 
     - name: Test with dotnet
       run: dotnet test --configuration Release
@@ -36,13 +36,13 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.101
+        dotnet-version: 6.x
 
     - name: Determine version
       run: echo "::set-env name=VERSION::$(git describe --tags --dirty)"
 
     - name: Publish with dotnet
-      run: dotnet publish src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj --output win-64x/ -r win-x64 --configuration Release /p:PublishSingleFile=true /p:IncludeSymbolsInSingleFile=true /p:UseAppHost=true /p:Version=$VERSION
+      run: dotnet publish src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj --output win-64x/ -r win-x64 --self-contained --configuration Release /p:PublishSingleFile=true /p:UseAppHost=true /p:Version=$VERSION
 
     - name: Create zip
       run: zip -r '../win-64x.zip' *

diff --git a/src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj b/src/Cmf.Tools.TestDetector.Console/Cmf.Tools.TestDetector.Console.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Cmf.Tools.TestDetector.Console/Properties/launchSettings.json b/src/Cmf.Tools.TestDetector.Console/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Cmf.Tools.TestDetector.Console": {
+      "commandName": "Project",
+      "commandLineArgs": "--repositorypath=\"\" --testsolutionpath=\"\" --testcategory=\"\" --sourcecommitid=\"\" --targetcommitid=\"\""
+    }
+  }
+}
diff --git a/src/Cmf.Tools.TestDetector/ChangeHandlers/CSharpRoslynChangeHandler.cs b/src/Cmf.Tools.TestDetector/ChangeHandlers/CSharpRoslynChangeHandler.cs
@@ -288,6 +288,8 @@ public async Task<bool> TryAddCategoryToTestMethod(string filePath, int lineNumb
                 throw new ArgumentOutOfRangeException(nameof(filePath));
             }
 
+            _logger.Info($"Adding category {category} to file {filePath}");
+
             var method = await FindMethod(roslynNode, lineNumber).ConfigureAwait(false);
 
             if (method == null)
@@ -365,6 +367,8 @@ public async Task Initialize(Solution solution)
                 throw new ArgumentNullException(nameof(solution));
             }
 
+            _logger.Debug($"Initializing solution {solution.FilePath}");
+
             _solution = solution;
             ProjectDependencyGraph projectGraph = solution.GetProjectDependencyGraph();
 

diff --git a/src/Cmf.Tools.TestDetector/Cmf.Tools.TestDetector.csproj b/src/Cmf.Tools.TestDetector/Cmf.Tools.TestDetector.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Company>Critical Manufacturing</Company>
     <Product>CMF Dev Test Detector</Product>
     <Authors>Critical Manufacturing</Authors>

diff --git a/tests/Cmf.Tools.TestDetector.UnitTests/Cmf.Tools.TestDetector.UnitTests.csproj b/tests/Cmf.Tools.TestDetector.UnitTests/Cmf.Tools.TestDetector.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>