upgrade to net8

lytico · Dec 7, 2023 · 167c3ee · 167c3ee
1 parent fd96847
commit 167c3ee
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Restore dotnet tools
         run: dotnet tool restore
       - name: Run build.cake

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <_GtkSharpNetVersion>7.0</_GtkSharpNetVersion>
+    <_GtkSharpNetVersion>8.0</_GtkSharpNetVersion>
     <_GtkSharpSourceDirectory>$(MSBuildThisFileDirectory)</_GtkSharpSourceDirectory>
     <_GtkSharpBuildOutputDirectory>$(MSBuildThisFileDirectory)..\BuildOutput\</_GtkSharpBuildOutputDirectory>
   </PropertyGroup>

diff --git a/Source/Samples/Samples.csproj b/Source/Samples/Samples.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>..\..\BuildOutput\Samples</OutputPath>
   </PropertyGroup>

diff --git a/...kSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json b/...kSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json
@@ -19,7 +19,7 @@
     "targetframework": {
       "type": "parameter",
       "description": "The target framework for the project.",
-      "defaultValue": "net7.0",
+      "defaultValue": "net8.0",
       "replaces": "$(FrameworkParameter)"
     }
   },

diff --git a/...kSharp.Template.FSharp/content/GtkSharp.Application.FSharp/.template.config/template.json b/...kSharp.Template.FSharp/content/GtkSharp.Application.FSharp/.template.config/template.json
@@ -19,7 +19,7 @@
     "targetframework": {
       "type": "parameter",
       "description": "The target framework for the project.",
-      "defaultValue": "net7.0",
+      "defaultValue": "net8.0",
       "replaces": "$(FrameworkParameter)"
     }
   },

diff --git a/...GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json b/...GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json
@@ -19,7 +19,7 @@
     "targetframework": {
       "type": "parameter",
       "description": "The target framework for the project.",
-      "defaultValue": "net7.0",
+      "defaultValue": "net8.0",
       "replaces": "$(FrameworkParameter)"
     }
   },

diff --git a/Source/Tools/GapiCodegen/GapiCodegen.csproj b/Source/Tools/GapiCodegen/GapiCodegen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputPath>..\..\..\BuildOutput\Tools</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>

diff --git a/Source/Tools/GapiFixup/GapiFixup.csproj b/Source/Tools/GapiFixup/GapiFixup.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputPath>..\..\..\BuildOutput\Tools</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>

diff --git a/Source/Workload/Directory.Build.props b/Source/Workload/Directory.Build.props
@@ -5,7 +5,7 @@
     <_GtkSharpVersion>$([System.Text.RegularExpressions.Regex]::Match($(Version), '(\d+)\.(\d+)'))</_GtkSharpVersion>
     <_GtkSharpTfm>net$(_GtkSharpNetVersion)-gtk</_GtkSharpTfm>
     <_GtkSharpFullTfm>net$(_GtkSharpNetVersion)-gtk$(_GtkSharpVersion)</_GtkSharpFullTfm>
-    <_GtkSharpManifestVersionBand Condition=" '$(_GtkSharpManifestVersionBand)' == '' ">7.0.400</_GtkSharpManifestVersionBand>
+    <_GtkSharpManifestVersionBand Condition=" '$(_GtkSharpManifestVersionBand)' == '' ">8.0.100</_GtkSharpManifestVersionBand>
     <!-- Folder format somewhat similar to packs in .NET, making stuff easier to install -->
     <OutputPath>$(_GtkSharpBuildOutputDirectory)WorkloadPacks\$(Configuration)\$(MSBuildProjectName)\$(Version)</OutputPath>
   </PropertyGroup>

diff --git a/Source/Workload/GtkSharp.Sdk/GtkSharp.Sdk.csproj b/Source/Workload/GtkSharp.Sdk/GtkSharp.Sdk.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\Shared\Common.targets" />
 
   <PropertyGroup>
-    <Description>GtkSharp SDK. Enabled via the net7.0-gtk TFM.</Description>
+    <Description>GtkSharp SDK. Enabled via the net8.0-gtk TFM.</Description>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Source/Workload/GtkSharp.Sdk/Sdk/Sdk.in.targets b/Source/Workload/GtkSharp.Sdk/Sdk/Sdk.in.targets
@@ -3,7 +3,7 @@
   <!-- GtkSharp target from the original nuget package -->
   <Import Project="..\targets\GtkSharp.targets" />
 
-  <!-- Register net7.0-gtk3.24 TFM -->
+  <!-- Register net8.0-gtk3.24 TFM -->
   <ItemGroup>
     <SupportedPlatform Include="gtk" />
   </ItemGroup>

diff --git a/Source/Workload/Shared/Frameworks.targets b/Source/Workload/Shared/Frameworks.targets
@@ -19,7 +19,7 @@
     <ItemGroup>
       <_RootAttribute Include="Name" Value="GtkSharp" />
       <_RootAttribute Include="TargetFrameworkIdentifier" Value=".NETCoreApp" />
-      <_RootAttribute Include="TargetFrameworkVersion" Value="7.0" />
+      <_RootAttribute Include="TargetFrameworkVersion" Value="8.0" />
       <_RootAttribute Include="FrameworkName" Value="$(MSBuildProjectName.Replace('.Ref','').Replace('.Runtime',''))" />
       <_AssemblyFiles Include="@(_PackageFiles)" Condition=" '%(_PackageFiles.Extension)' == '.dll' and '%(_PackageFiles.SubFolder)' == '' " />
       <_Classifications Include="@(_AssemblyFiles->'%(FileName)%(Extension)'->Distinct())" Profile="GTK" />

diff --git a/build.cake b/build.cake
@@ -14,7 +14,7 @@ var configuration = Argument("Configuration", "Release");
 
 var msbuildsettings = new DotNetMSBuildSettings();
 var list = new List<GAssembly>();
-var supportedVersionBands = new List<string>() {"6.0.100", "6.0.200", "6.0.300", "6.0.400","7.0.400"};
+var supportedVersionBands = new List<string>() {"6.0.100", "6.0.200", "6.0.300", "6.0.400", "7.0.400", "8.0.100"};
 
 // TASKS