Update to .net 8.0

xt0rted · Feb 16, 2024 · 1c0a98d · 1c0a98d
1 parent 6e0c18f
commit 1c0a98d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 37 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,14 +60,6 @@ jobs:
           source-url: https://nuget.pkg.github.com/xt0rted/index.json
           nuget_auth_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up .NET
-        uses: xt0rted/[email protected]
-        with:
-          colored-output: false
-          strip-comments-from-global-json: false
-          dotnet-version: |
-            3.1.x
-
       - run: dotnet tool restore
 
       - run: dotnet r build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,14 +31,6 @@ jobs:
           source-url: https://nuget.pkg.github.com/xt0rted/index.json
           nuget_auth_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up .NET
-        uses: xt0rted/[email protected]
-        with:
-          colored-output: false
-          strip-comments-from-global-json: false
-          dotnet-version: |
-            3.1.x
-
       - name: Get changelog entry
         uses: mindsers/[email protected]
         id: changelog_reader

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+- Added support for .NET 8.0
+- Dropped support for .NET Core 3.1 and .NET 6.0
+
 ## [1.0.0](https://github.com/xt0rted/dotnet-startup-projects/releases/tag/v1.0.0) - 2022-10-17
 
 Initial release
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,27 +1,18 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>preview</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AnalysisLevel>latest</AnalysisLevel>
-  </PropertyGroup>
-
   <PropertyGroup>
     <VersionPrefix>1.0.0</VersionPrefix>
     <Authors>Brian Surowiec</Authors>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(CI)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="IDisposableAnalyzers" Version="4.0.6">
       <PrivateAssets>all</PrivateAssets>

diff --git a/global.json b/global.json
@@ -1,15 +1,13 @@
 {
   "sdk": {
-    "version": "6.0.419"
+    "version": "8.0.101"
   },
   "scripts": {
     "clean": "dotnet rimraf artifacts",
     "clean:bin": "dotnet rimraf src/**/bin src/**/obj test/**/bin test/**/obj",
     "clean:test": "dotnet rimraf integration/.vs integration/**/bin integration/**/obj",
     "build": "dotnet build",
     "test": "dotnet test",
-    "test:31": "dotnet test --framework netcoreapp3.1",
-    "test:6": "dotnet test --framework net6.0",
     "prepack": "dotnet r clean",
     "pack": "dotnet pack --no-build --output ./artifacts"
   }

diff --git a/integration/Directory.Build.props b/integration/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>disable</Nullable>
   </PropertyGroup>
 

diff --git a/src/startup-projects.csproj b/src/startup-projects.csproj
@@ -15,13 +15,11 @@
   <PropertyGroup>
     <Description>dotnet tool to set multiple startup projects in Visual Studio</Description>
     <Deterministic>true</Deterministic>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PackageIcon>icon.png</PackageIcon>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageReleaseNotes>See https://github.com/xt0rted/dotnet-startup-projects/blob/main/CHANGELOG.md for more info</PackageReleaseNotes>
     <PackageTags>dotnet, tool, cli, build, startup, projects</PackageTags>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <RepositoryBranch>main</RepositoryBranch>
   </PropertyGroup>
 
@@ -50,11 +48,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="6.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="8.0.0" />
     <PackageReference Include="SetStartupProjects" Version="1.10.0" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1" />