Added net6 and removed netcoreapp2.1

seesharper · seesharper · commit e5f35d2bc941 · 2021-06-29T23:56:43.000+02:00
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.100",
+    "version": "6.0.100-preview.5.21302.13",
     "rollForward": "latestFeature"
   }
 }
diff --git a/src/.vscode/tasks.json b/src/.vscode/tasks.json
@@ -24,7 +24,7 @@
         "-c",
         "release",
         "-f",
-        "netcoreapp3.1",
+        "net6.0",
         "${workspaceFolder}/Dotnet.Script.Tests/DotNet.Script.Tests.csproj"
       ],
       "problemMatcher": "$msCompile",
@@ -55,4 +55,4 @@
       }
     }
   ]
-}
+}
diff --git a/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj b/src/Dotnet.Script.Tests/Dotnet.Script.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../dotnet-script.snk</AssemblyOriginatorKeyFile>
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -4,7 +4,7 @@
         <VersionPrefix>1.1.0</VersionPrefix>
         <Authors>filipw</Authors>
         <PackageId>Dotnet.Script</PackageId>
-        <TargetFrameworks>net5.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
         <DebugType>portable</DebugType>
         <AssemblyName>dotnet-script</AssemblyName>
         <OutputType>Exe</OutputType>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "5.0.100",`
	`3`	`+ "version": "6.0.100-preview.5.21302.13",`
`4`	`4`	`"rollForward": "latestFeature"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`"-c",`
`25`	`25`	`"release",`
`26`	`26`	`"-f",`
`27`		`- "netcoreapp3.1",`
	`27`	`+ "net6.0",`
`28`	`28`	`"${workspaceFolder}/Dotnet.Script.Tests/DotNet.Script.Tests.csproj"`
`29`	`29`	`],`
`30`	`30`	`"problemMatcher": "$msCompile",`
`@@ -55,4 +55,4 @@`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`]`
`58`		`-}`
	`58`	`+}`