Bump Target Framework

iwillspeak · Jun 10, 2023 · 2ea7e3d · 2ea7e3d
1 parent f31b779
commit 2ea7e3d
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 25 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/src/Feersum/bin/Debug/net6.0/Feersum.dll",
+            "program": "${workspaceRoot}/src/Feersum/bin/Debug/net7.0/Feersum.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "console": "integratedTerminal",
@@ -20,7 +20,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "buildStage1",
-            "program": "${workspaceRoot}/src/Feersum.Stage1/bin/Debug/net6.0/Feersum.Stage1.dll",
+            "program": "${workspaceRoot}/src/Feersum.Stage1/bin/Debug/net7.0/Feersum.Stage1.dll",
             "args": [
               "--output", "bin/Test/",
               "lists.scm",
@@ -54,7 +54,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceRoot}/src/Feersum/bin/Debug/net6.0/Feersum.dll",
+            "program": "${workspaceRoot}/src/Feersum/bin/Debug/net7.0/Feersum.dll",
             "args": [
                 "--output",
                 "${workspaceRoot}/spec/bin",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -68,7 +68,7 @@
         "type": "shell",
         "dependsOn": "build",
         "args": [
-          "${workspaceFolder}/src/Feersum/bin/Debug/net6.0/Feersum.dll",
+          "${workspaceFolder}/src/Feersum/bin/Debug/net7.0/Feersum.dll",
           "--configuration",
           "Debug",
           "-o",

diff --git a/eng/UseLocalCompiler.props b/eng/UseLocalCompiler.props
@@ -10,7 +10,7 @@
     <NoImplicitFeersumCoreReference>true</NoImplicitFeersumCoreReference>
     <CompilerConfiguration>$(Configuration)</CompilerConfiguration>
     <CompilerConfiguration Condition=" '$(CompilerConfiguration)' == '' ">Debug</CompilerConfiguration>
-    <FeersumCompilerPath>$(MSBuildThisFileDirectory)..\src\Feersum\bin\$(CompilerConfiguration)\net6.0\Feersum.dll</FeersumCompilerPath>
+    <FeersumCompilerPath>$(MSBuildThisFileDirectory)..\src\Feersum\bin\$(CompilerConfiguration)\net7.0\Feersum.dll</FeersumCompilerPath>
   </PropertyGroup>
 
   <!-- Refernece our core library so it is available to import, and `dotnet` copies it to the output directory. -->
@@ -20,7 +20,7 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Feersum\Feersum.fsproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <Private>false</Private>
-      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net7.0</SetTargetFramework>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>

diff --git a/eng/UseStage1Compiler.props b/eng/UseStage1Compiler.props
@@ -10,7 +10,7 @@
     <NoImplicitFeersumCoreReference>true</NoImplicitFeersumCoreReference>
     <CompilerConfiguration>$(Configuration)</CompilerConfiguration>
     <CompilerConfiguration Condition=" '$(CompilerConfiguration)' == '' ">Debug</CompilerConfiguration>
-    <FeersumCompilerPath>$(MSBuildThisFileDirectory)..\src\Feersum.Stage1\bin\$(CompilerConfiguration)\net6.0\Feersum.Stage1.dll</FeersumCompilerPath>
+    <FeersumCompilerPath>$(MSBuildThisFileDirectory)..\src\Feersum.Stage1\bin\$(CompilerConfiguration)\net7.0\Feersum.Stage1.dll</FeersumCompilerPath>
   </PropertyGroup>
 
   <!-- Refernece our core library so it is available to import, and `dotnet` copies it to the output directory. -->
@@ -19,7 +19,7 @@
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Feersum.Stage1\Feersum.Stage1.fsproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <Private>false</Private>
-      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net7.0</SetTargetFramework>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
   </ItemGroup>

diff --git a/examples/HelloWorld/HelloWorld.scmproj b/examples/HelloWorld/HelloWorld.scmproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <PackAsTool>True</PackAsTool>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net7.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Default compile items. We don't to just glob default compile items because ordering matters. -->

diff --git a/runspec.sh b/runspec.sh
@@ -24,6 +24,6 @@ cd "$( dirname "${BASH_SOURCE[0]}" )"
 set -euo pipefail
 
 dotnet build --configuration Release src/Feersum && \
-    dotnet src/Feersum/bin/Release/net6.0/Feersum.dll ${specname} \
+    dotnet src/Feersum/bin/Release/net7.0/Feersum.dll ${specname} \
         --outputtype exe -o ${specbin} && \
     dotnet ${specbin}
diff --git a/src/Feersum.CompilerServices/Feersum.CompilerServices.fsproj b/src/Feersum.CompilerServices/Feersum.CompilerServices.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Title>Feersum Scheme Compiler Services Library</Title>
     <Description>

diff --git a/src/Feersum.Sdk/Feersum.Sdk.proj b/src/Feersum.Sdk/Feersum.Sdk.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.1.0">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackageType>MSBuildSdk</PackageType>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <Description>

diff --git a/src/Feersum.Sdk/targets/Feersum.Sdk.Core.targets b/src/Feersum.Sdk/targets/Feersum.Sdk.Core.targets
@@ -68,7 +68,7 @@
 
     <PropertyGroup>
       <!-- The path to the compiler exectuable. -->
-      <FeersumCompilerPath Condition=" '$(FeersumCompilerPath)' == '' ">$(PkgFeersum)/tools/net6.0/any/Feersum.dll</FeersumCompilerPath>
+      <FeersumCompilerPath Condition=" '$(FeersumCompilerPath)' == '' ">$(PkgFeersum)/tools/net7.0/any/Feersum.dll</FeersumCompilerPath>
       <DotNetPath>$(DOTNET_HOST_PATH)</DotNetPath>
       <DotNetPath Condition=" '$(DotNetPath)' == '' ">dotnet</DotNetPath>
     </PropertyGroup>

diff --git a/src/Feersum.Stage1/Feersum.Stage1.fsproj b/src/Feersum.Stage1/Feersum.Stage1.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/Feersum.Templates/Feersum.Templates.proj b/src/Feersum.Templates/Feersum.Templates.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.1.0">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackageType>Template</PackageType>
     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
     <Description>

diff --git a/src/Feersum.Templates/templates/classlib/.template.config/template.json b/src/Feersum.Templates/templates/classlib/.template.config/template.json
@@ -14,11 +14,11 @@
     "Framework": {
       "type": "parameter",
       "datatype": "choice",
-      "defaultValue": "net6.0",
-      "replaces": "net6.0",
+      "defaultValue": "net7.0",
+      "replaces": "net7.0",
       "choices": [
         {
-          "choice": "net6.0",
+          "choice": "net7.0",
           "description": "Target .NET 6"
         },
         {

diff --git a/src/Feersum.Templates/templates/classlib/FeersumLibrary.scmproj b/src/Feersum.Templates/templates/classlib/FeersumLibrary.scmproj
@@ -1,7 +1,7 @@
 <Project Sdk="Feersum.Sdk/0.2.1">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Feersum.Templates/templates/console/.template.config/template.json b/src/Feersum.Templates/templates/console/.template.config/template.json
@@ -14,11 +14,11 @@
     "Framework": {
       "type": "parameter",
       "datatype": "choice",
-      "defaultValue": "net6.0",
-      "replaces": "net6.0",
+      "defaultValue": "net7.0",
+      "replaces": "net7.0",
       "choices": [
         {
-          "choice": "net6.0",
+          "choice": "net7.0",
           "description": "Target .NET 6"
         },
         {

diff --git a/src/Feersum.Templates/templates/console/FeersumConsole.scmproj b/src/Feersum.Templates/templates/console/FeersumConsole.scmproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Feersum/Feersum.fsproj b/src/Feersum/Feersum.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <PackAsTool>True</PackAsTool>
     <ToolCommandName>feersum-scheme</ToolCommandName>
     <Title>The Feersum Scheme Compiler</Title>

diff --git a/test/Feersum.Tests/Feersum.Tests.fsproj b/test/Feersum.Tests/Feersum.Tests.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Feersum\Feersum.fsproj" />