Add a .NET6 support

jiowcl · Nov 11, 2021 · d046033 · d046033
1 parent 7af7a3b
commit d046033
Show file tree

Hide file tree

Showing 6 changed files with 85 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 "./OxygenBasic.NET"
- - dotnet build -f netstandard2.1
+ - dotnet build
+# - dotnet build -f netstandard2.1
diff --git a/OxygenBasic.Example/OxygenBasic.Example.csproj b/OxygenBasic.Example/OxygenBasic.Example.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net5.0-windows</TargetFrameworks>
     <StartupObject>OxygenBasic.Example.Program</StartupObject>
     <Authors>Jiowcl</Authors>
     <Company>Inwazy Technology</Company>
@@ -12,12 +12,23 @@
     <PackageProjectUrl>https://github.com/jiowcl/OxygenBasic.NET</PackageProjectUrl>
     <RepositoryUrl>https://github.com/jiowcl/OxygenBasic.NET</RepositoryUrl>
     <PackageReleaseNotes>1.0.0</PackageReleaseNotes>
+    <PlatformTarget>x86</PlatformTarget>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\OxygenBasic.NET\OxygenBasic.NET.csproj" />
   </ItemGroup>
@@ -31,6 +42,10 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/OxygenBasic.NET.sln b/OxygenBasic.NET.sln
@@ -1,32 +1,60 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OxygenBasic.NET", "OxygenBasic.NET\OxygenBasic.NET.csproj", "{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OxygenBasic.NETTests", "OxygenBasic.NETTests\OxygenBasic.NETTests.csproj", "{37AE8738-9F0D-4755-8E3E-F3376AB115E2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OxygenBasic.Example", "OxygenBasic.Example\OxygenBasic.Example.csproj", "{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OxygenBasic.Example", "OxygenBasic.Example\OxygenBasic.Example.csproj", "{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Debug|x64.ActiveCfg = Debug|x64
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Debug|x64.Build.0 = Debug|x64
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Debug|x86.ActiveCfg = Debug|x86
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Debug|x86.Build.0 = Debug|x86
 		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Release|x64.ActiveCfg = Release|x64
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Release|x64.Build.0 = Release|x64
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Release|x86.ActiveCfg = Release|x86
+		{52A7754E-31E0-4FC4-A1FE-3F0A35CCE94B}.Release|x86.Build.0 = Release|x86
 		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Debug|x64.ActiveCfg = Debug|x64
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Debug|x64.Build.0 = Debug|x64
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Debug|x86.ActiveCfg = Debug|x86
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Debug|x86.Build.0 = Debug|x86
 		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Release|x64.ActiveCfg = Release|x64
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Release|x64.Build.0 = Release|x64
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Release|x86.ActiveCfg = Release|x86
+		{37AE8738-9F0D-4755-8E3E-F3376AB115E2}.Release|x86.Build.0 = Release|x86
 		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Debug|x64.ActiveCfg = Debug|x64
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Debug|x64.Build.0 = Debug|x64
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Debug|x86.ActiveCfg = Debug|x86
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Debug|x86.Build.0 = Debug|x86
 		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Release|x64.ActiveCfg = Release|x64
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Release|x64.Build.0 = Release|x64
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Release|x86.ActiveCfg = Release|x86
+		{A9A79CA0-A9D7-4E82-ADD8-3B5EC5E1AE19}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/OxygenBasic.NET/OxygenBasic.NET.csproj b/OxygenBasic.NET/OxygenBasic.NET.csproj
@@ -1,25 +1,37 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>net6.0-windows;net5.0-windows</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Copyright>Ji-Feng Tsai</Copyright>
     <Description>.NET Wrapper for OxygenBasic Programming Language.</Description>
     <Company>Inwazy Technology</Company>
     <Authors>Jiowcl</Authors>
     <PackageProjectUrl>https://github.com/jiowcl/OxygenBasic.NET</PackageProjectUrl>
-    <PackageReleaseNotes>1.0.2</PackageReleaseNotes>
+    <PackageReleaseNotes>1.0.3</PackageReleaseNotes>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
     <RepositoryUrl>https://github.com/jiowcl/OxygenBasic.NET</RepositoryUrl>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <PlatformTarget>x86</PlatformTarget>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+
   <ItemGroup>
     <None Update="oxygen.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -28,6 +40,10 @@
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/OxygenBasic.NETTests/OxygenBasic.NETTests.csproj b/OxygenBasic.NETTests/OxygenBasic.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>
 
@@ -18,12 +18,24 @@
     <RepositoryUrl>https://github.com/jiowcl/OxygenBasic.NET</RepositoryUrl>
 
     <PackageReleaseNotes>1.0.0</PackageReleaseNotes>
+
+    <PlatformTarget>x86</PlatformTarget>
+
+    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.5" />

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@
 
 - Windows 7 above (recommend)  
 - OxygenBasic 0.30  
-- .NET Standard 2.1  
+- .NET 6  
 
 ## NuGet Installation
 
@@ -21,7 +21,7 @@ PM> Install-Package OxygenBasic.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
 
@@ -38,6 +38,7 @@ Console.ReadKey();
 ## License
 
 Copyright (c) 2017-2021 Ji-Feng Tsai.  
+OxygenBasic Copyright (c) Charles Pegge [OxygenBasic Compiler](https://github.com/Charles-Pegge/OxygenBasic).  
 Code released under the MIT license.  
 
 ## TODO