Replaced .NET 5.0 with .NET 6.0 build target

nano-byte · Dec 3, 2021 · 0ee5f3b · 0ee5f3b
1 parent b4e9f79
commit 0ee5f3b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
       # Prepare
       - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ Take a look a the [sample project](src/Sample) for a more complete setup, includ
 
 The source code is in [`src/`](src/), config for building the API documentation is in [`doc/`](doc/) and generated build artifacts are placed in `artifacts/`. The source code does not contain version numbers. Instead the version is determined during CI using [GitVersion](https://gitversion.net/).
 
-To build install [Visual Studio 2019 v16.8 or newer](https://www.visualstudio.com/downloads/) and run `.\build.ps1`.
+To build install [Visual Studio 2022 or newer](https://www.visualstudio.com/downloads/) and run `.\build.ps1`.
 
 ## Contributing
 

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -23,6 +23,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <AssemblyName>NanoByte.StructureEditor.Sample</AssemblyName>
     <RootNamespace>NanoByte.StructureEditor.Sample</RootNamespace>
-    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
     <UseWindowsForms>True</UseWindowsForms>
     <OutputPath>..\..\artifacts\$(Configuration)\</OutputPath>
     <OutputType>WinExe</OutputType>
@@ -14,9 +14,9 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
     <!-- .NET Core MSBuild does not support non-primitive resources (e.g., images) for .NET Framework -->
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net5.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/StructureEditor.WinForms/StructureEditor.WinForms.csproj b/src/StructureEditor.WinForms/StructureEditor.WinForms.csproj
@@ -6,16 +6,16 @@
     <RootNamespace>NanoByte.StructureEditor.WinForms</RootNamespace>
     <Description>WinForms controls for building split-screen editors for data structures</Description>
     <PackageTags>WinForms;split-screen;editor;data structures</PackageTags>
-    <TargetFrameworks>net45;net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net45;net6.0-windows</TargetFrameworks>
     <UseWindowsForms>True</UseWindowsForms>
     <OutputPath>..\..\artifacts\$(Configuration)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
     <!-- .NET Core MSBuild does not support non-primitive resources (e.g., images) for .NET Framework -->
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='net5.0-windows'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -40,11 +40,7 @@
       <Pack>true</Pack>
     </None>
     <None Include="..\..\lib\ICSharpCode.TextEditor.*">
-      <PackagePath>lib/net472</PackagePath>
-      <Pack>true</Pack>
-    </None>
-    <None Include="..\..\lib\ICSharpCode.TextEditor.*">
-      <PackagePath>lib/net5.0-windows7.0</PackagePath>
+      <PackagePath>lib/net6.0-windows7.0</PackagePath>
       <Pack>true</Pack>
     </None>
   </ItemGroup>

diff --git a/src/StructureEditor/StructureEditor.csproj b/src/StructureEditor/StructureEditor.csproj
@@ -5,10 +5,10 @@
     <AssemblyName>NanoByte.StructureEditor</AssemblyName>
     <RootNamespace>NanoByte.StructureEditor</RootNamespace>
     <Description>Utility classes and data structures with an emphasis on integration with native Windows and Linux features, network and disk IO, advanced collections and undo/redo logic.</Description>
-    <TargetFrameworks>net45;net472;netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.1</TargetFrameworks>
     <OutputPath>..\..\artifacts\$(Configuration)\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1' Or '$(TargetFramework)'=='net5.0'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -4,16 +4,16 @@
   <PropertyGroup>
     <AssemblyName>NanoByte.StructureEditor.UnitTests</AssemblyName>
     <RootNamespace>NanoByte.StructureEditor</RootNamespace>
-    <TargetFrameworks>net48;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <IsPackable>False</IsPackable>
     <DeterministicSourcePaths>False</DeterministicSourcePaths>
   </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildRuntimeType)'=='Core'">
     <!-- .NET Core MSBuild does not support non-primitive resources (e.g., images) for .NET Framework -->
-    <TargetFrameworks>net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework)=='net5.0-windows'">
+  <PropertyGroup Condition="$(TargetFramework)=='net6.0-windows'">
     <!-- Run nullability analysis only on annotated frameworks -->
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/build.ps1 b/src/build.ps1
@@ -12,7 +12,7 @@ function Find-MSBuild {
 }
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 5.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
 
@@ -22,7 +22,7 @@ function Run-MSBuild {
         . $msbuild @args
         if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
     } else {
-        Write-Warning "You need Visual Studio 2019 v16.8+ to perform a full build of this project"
+        Write-Warning "You need Visual Studio 2022 to perform a full build of this project"
         Run-DotNet msbuild @args
     }
 }

diff --git a/src/test.ps1 b/src/test.ps1
@@ -2,7 +2,7 @@
 pushd $PSScriptRoot
 
 function Run-DotNet {
-    ..\0install.ps1 run --batch --version 5.0.. https://apps.0install.net/dotnet/sdk.xml @args
+    ..\0install.ps1 run --batch --version 6.0.. https://apps.0install.net/dotnet/sdk.xml @args
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }