Merge pull request #290 from dustinsoftware/master

Target net60

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '20 0 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'csharp' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

Project2015To2017.Core/PathCompat.NETCore.cs

@@ -5,7 +5,7 @@ namespace Project2015To2017
 {
 	public static partial class PathCompat
 	{
-#if NETCOREAPP2_1
+#if NET6_0
 		/// <summary>
 		/// Create a relative path from one path to another. Paths will be resolved before calculating the difference.
 		/// Default path comparison for the active platform will be used (OrdinalIgnoreCase for Windows or Mac, Ordinal for Unix).

Project2015To2017.Core/Project2015To2017.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks>netstandard2.0;net461;netcoreapp2.1</TargetFrameworks>
+	<TargetFrameworks>netstandard2.0;net461;net6.0</TargetFrameworks>
 	<RootNamespace>Project2015To2017</RootNamespace>
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>

Project2015To2017.Migrate2017.Tool/Project2015To2017.Migrate2017.Tool.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks Condition="$(Pack) != 'true'">net461;netcoreapp2.1</TargetFrameworks>
-	<TargetFramework Condition="$(Pack) == 'true'">netcoreapp2.1</TargetFramework>
+	<TargetFrameworks Condition="$(Pack) != 'true'">net461;net6.0</TargetFrameworks>
+	<TargetFramework Condition="$(Pack) == 'true'">net6.0</TargetFramework>
 	<PackAsTool Condition="$(Pack) == 'true'">True</PackAsTool>
 
 	<AssemblyName>dotnet-migrate-2017</AssemblyName>

Project2015To2017.Migrate2019.Tool/Project2015To2017.Migrate2019.Tool.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFrameworks Condition="$(Pack) != 'true'">net461;netcoreapp2.1</TargetFrameworks>
-	<TargetFramework Condition="$(Pack) == 'true'">netcoreapp2.1</TargetFramework>
+	<TargetFrameworks Condition="$(Pack) != 'true'">net461;net6.0</TargetFrameworks>
+	<TargetFramework Condition="$(Pack) == 'true'">net6.0</TargetFramework>
 	<PackAsTool Condition="$(Pack) == 'true'">True</PackAsTool>
 
 	<AssemblyName>dotnet-migrate-2019</AssemblyName>

Project2015To2017.Tests/Project2015To2017.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-	<TargetFramework>netcoreapp2.1</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

appveyor.yml

@@ -16,10 +16,10 @@ build_script:
   - cmd: dotnet --version
   - cmd: dotnet pack %LIBRARY% %LOGGER% -v m -c %configuration% --force /p:Pack=true
   - cmd: dotnet pack %CLITOOL2017% %LOGGER% -v m -c %configuration% --force /p:Pack=true
-  - cmd: dotnet publish %CLITOOL2017% %LOGGER% -v m -c %configuration% -f netcoreapp2.1 -o ./out2017/netcoreapp2.1
+  - cmd: dotnet publish %CLITOOL2017% %LOGGER% -v m -c %configuration% -f net6.0 -o ./out2017/net6.0
   - cmd: dotnet publish %CLITOOL2017% %LOGGER% -v m -c %configuration% -f net461 -o ./out2017/net461
   - cmd: dotnet pack %CLITOOL2019% %LOGGER% -v m -c %configuration% --force /p:Pack=true
-  - cmd: dotnet publish %CLITOOL2019% %LOGGER% -v m -c %configuration% -f netcoreapp2.1 -o ./out2019/netcoreapp2.1
+  - cmd: dotnet publish %CLITOOL2019% %LOGGER% -v m -c %configuration% -f net6.0 -o ./out2019/net6.0
   - cmd: dotnet publish %CLITOOL2019% %LOGGER% -v m -c %configuration% -f net461 -o ./out2019/net461
 after_build:
   - cmd: 7z a ./dotnet-migrate-2017.zip ./out2017/*