Add a .NET6 support

jiowcl · Nov 11, 2021 · a06274b · a06274b
1 parent 1297317
commit a06274b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,8 @@
 language: csharp
-dotnet: 5.0
+dotnet: 6.0
 dist: xenial
 mono: none
 script:
  - cd "./ThinBasic.NET"
- - dotnet build -f netstandard2.1
+ - dotnet build
+# - dotnet build -f netstandard2.1
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 - Windows 7 above (recommend)  
 - ThinBasic 1.10  
-- .NET Standard 2.1  
+- .NET 6
 
 ## NuGet Installation
 
@@ -21,7 +21,7 @@ PM> Install-Package ThinBasic.NET
 
 ## How to Build
 
-Building requires [Visual Studio 2019 Community](https://visualstudio.microsoft.com/vs/community/) and test under Windows 10.
+Building requires [Visual Studio 2022 Community](https://visualstudio.microsoft.com/vs/community/) and test under Windows 10.
 
 ## Example
 
@@ -40,6 +40,7 @@ Thinbasic.Release(0);
 ## License
 
 Copyright (c) 2017-2021 Ji-Feng Tsai.  
+ThinBasic Copyright (c) Eros Olmi [ThinBASIC Interpreter](https://github.com/ThinBASIC).  
 Code released under the MIT license.  
 
 ## TODO

diff --git a/ThinBasic.Example/ThinBasic.Example.csproj b/ThinBasic.Example/ThinBasic.Example.csproj
@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net5.0-windows</TargetFrameworks>
     <StartupObject>ThinBasic.Example.Program</StartupObject>
     <Authors>Jiowcl</Authors>
     <Company>Inwazy Technology</Company>
@@ -13,6 +13,7 @@
     <RepositoryUrl>https://github.com/jiowcl/ThinBasic.NET</RepositoryUrl>
     <PackageReleaseNotes>1.0.0</PackageReleaseNotes>
     <Platforms>AnyCPU;x86</Platforms>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/ThinBasic.NET/ThinBasic.NET.csproj b/ThinBasic.NET/ThinBasic.NET.csproj
@@ -1,24 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net5.0-windows</TargetFrameworks>
     <Company>Inwazy Technology</Company>
     <Copyright>Ji-Feng Tsai</Copyright>
     <Description>.Net Wrapper for ThinBasic Programming Language.</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/jiowcl/ThinBasic.NET</RepositoryUrl>
-    <PackageReleaseNotes>1.0.3</PackageReleaseNotes>
+    <PackageReleaseNotes>1.0.4</PackageReleaseNotes>
     <Authors>Jiowcl</Authors>
     <PackageProjectUrl>https://github.com/jiowcl/ThinBasic.NET</PackageProjectUrl>
     <Platforms>AnyCPU;x86</Platforms>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <PackageIcon></PackageIcon>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
-    <AssemblyVersion>1.0.3.0</AssemblyVersion>
-    <FileVersion>1.0.3.0</FileVersion>
+    <AssemblyVersion></AssemblyVersion>
+    <FileVersion></FileVersion>
     <SignAssembly>false</SignAssembly>
+    <ApplicationIcon>thinbasic.net.ico</ApplicationIcon>
+    <PlatformTarget>x86</PlatformTarget>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -33,11 +37,19 @@
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="thinbasic.net.ico" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Include="..\LICENSE">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/ThinBasic.NET/thinbasic.net.ico b/ThinBasic.NET/thinbasic.net.ico
diff --git a/ThinBasic.NETTests/ThinBasic.NETTests.csproj b/ThinBasic.NETTests/ThinBasic.NETTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net5.0-windows</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 
@@ -22,6 +22,10 @@
     <RepositoryUrl>https://github.com/jiowcl/ThinBasic.NET</RepositoryUrl>
 
     <PackageReleaseNotes>1.0.0</PackageReleaseNotes>
+
+    <PlatformTarget>x86</PlatformTarget>
+
+    <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -54,6 +58,10 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
 </Project>