Merge branch 'master' into feature/tree-source-gen

GGG-KILLER · Jan 22, 2024 · e2d054d · e2d054d
2 parents 5dd8fbb + 77de951
commit e2d054d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -22,9 +22,9 @@ jobs:
       uses: actions/setup-dotnet@v2
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
           7.0.x
+          8.0.x
         include-prerelease: true
     - name: Install dependencies
       run: dotnet restore
@@ -44,9 +44,9 @@ jobs:
       uses: actions/setup-dotnet@v2
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
           7.0.x
+          8.0.x
         include-prerelease: true
     - name: Install dependencies
       run: dotnet restore
@@ -65,26 +65,27 @@ jobs:
         }
       shell: pwsh
 
-  train:
-    name: Intellicode Train
-    runs-on: windows-latest
-    needs: [build]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 0 # We need to fetch the entire Git history in order to verify the authenticity.
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: |
-          3.1.x
-          6.0.x
-          7.0.x
-        include-prerelease: true
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-    - name: Train Intellicode Model
-      uses: microsoft/vs-intellicode@v1
+  # TODO: Fix when I can be bothered to.
+  # train:
+  #   name: Intellicode Train
+  #   runs-on: windows-latest
+  #   needs: [build]
+  #   if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #     with:
+  #       fetch-depth: 0 # We need to fetch the entire Git history in order to verify the authenticity.
+  #   - name: Setup .NET
+  #     uses: actions/setup-dotnet@v2
+  #     with:
+  #       dotnet-version: |
+  #         6.0.x
+  #         7.0.x
+  #         8.0.x
+  #       include-prerelease: true
+  #   - name: Install dependencies
+  #     run: dotnet restore
+  #   - name: Build
+  #     run: dotnet build --configuration Release --no-restore
+  #   - name: Train Intellicode Model
+  #     uses: microsoft/vs-intellicode@v1
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,8 +7,8 @@
 
   <PropertyGroup>
     <RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
-    <LibraryTargetFrameworks>$(LibraryTargetFrameworks);netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0;net7.0</LibraryTargetFrameworks>
-    <TestTargetFrameworks>$(TestTargetFrameworks);netcoreapp3.1;net6.0;net7.0</TestTargetFrameworks>
+    <LibraryTargetFrameworks>$(LibraryTargetFrameworks);netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</LibraryTargetFrameworks>
+    <TestTargetFrameworks>$(TestTargetFrameworks);net6.0;net7.0;net8.0</TestTargetFrameworks>
   </PropertyGroup>
 
   <Import Project="$(RepositoryRootDirectory)build/Settings.props" />

diff --git a/Tsu.Benchmarks/Tsu.Benchmarks.csproj b/Tsu.Benchmarks/Tsu.Benchmarks.csproj
@@ -4,7 +4,7 @@
     <TsuProjectType>Console</TsuProjectType>
 
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>