Skip to content

Commit

Permalink
Update to .NET Standard 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jiowcl committed May 27, 2021
1 parent 9deb36d commit 5b4c534
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 160 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

- Windows 7 above (recommend)
- ThinBasic 1.10
- .NET Standard 2.0
- .NET Standard 2.1

## NuGet Installation

Expand Down
6 changes: 0 additions & 6 deletions ThinBasic.Example/App.config

This file was deleted.

36 changes: 0 additions & 36 deletions ThinBasic.Example/Properties/AssemblyInfo.cs

This file was deleted.

132 changes: 31 additions & 101 deletions ThinBasic.Example/ThinBasic.Example.csproj
Original file line number Diff line number Diff line change
@@ -1,120 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{039B05BE-7B73-45FA-97F1-84E7E300EC83}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>ThinBasic.Example</RootNamespace>
<AssemblyName>ThinBasic.Example</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TargetFramework>net5.0</TargetFramework>
<StartupObject>ThinBasic.Example.Program</StartupObject>
<Authors>Jiowcl</Authors>
<Company>Inwazy Technology</Company>
<Description>.Net Wrapper Example for ThinBasic Programming Language.</Description>
<Copyright>Ji-Feng Tsai</Copyright>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/jiowcl/ThinBasic.NET</PackageProjectUrl>
<RepositoryUrl>https://github.com/jiowcl/ThinBasic.NET</RepositoryUrl>
<PackageReleaseNotes>1.0.0</PackageReleaseNotes>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<StartupObject>ThinBasic.Example.Program</StartupObject>
</PropertyGroup>

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Folder Include="Sample\" />
</ItemGroup>

<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<ProjectReference Include="..\ThinBasic.NET\ThinBasic.NET.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="App.config" />
<None Include="Sample\test_date.tbasic">
<None Update="Sample\test_date.tbasic">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Sample\test_fib.tbasic">
<None Update="Sample\test_fib.tbasic">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Sample\test_gui.tbasic">
<None Update="Sample\test_gui.tbasic">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ThinBasic.NET\ThinBasic.NET.csproj">
<Project>{0f05238c-23ff-4d59-8bec-ffe311282f48}</Project>
<Name>ThinBasic.NET</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.8">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4.8 %28x86 和 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
20 changes: 10 additions & 10 deletions ThinBasic.NET.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ VisualStudioVersion = 16.0.29215.179
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThinBasic.NET", "ThinBasic.NET\ThinBasic.NET.csproj", "{0F05238C-23FF-4D59-8BEC-FFE311282F48}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThinBasic.Example", "ThinBasic.Example\ThinBasic.Example.csproj", "{039B05BE-7B73-45FA-97F1-84E7E300EC83}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThinBasic.NETTests", "ThinBasic.NETTests\ThinBasic.NETTests.csproj", "{6A80132D-7306-4E0E-A1AF-146A1C72CF76}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThinBasic.Example", "ThinBasic.Example\ThinBasic.Example.csproj", "{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,14 +25,6 @@ Global
{0F05238C-23FF-4D59-8BEC-FFE311282F48}.Release|Any CPU.Build.0 = Release|Any CPU
{0F05238C-23FF-4D59-8BEC-FFE311282F48}.Release|x86.ActiveCfg = Release|x86
{0F05238C-23FF-4D59-8BEC-FFE311282F48}.Release|x86.Build.0 = Release|x86
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Debug|Any CPU.Build.0 = Debug|Any CPU
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Debug|x86.ActiveCfg = Debug|x86
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Debug|x86.Build.0 = Debug|x86
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Release|Any CPU.ActiveCfg = Release|Any CPU
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Release|Any CPU.Build.0 = Release|Any CPU
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Release|x86.ActiveCfg = Release|x86
{039B05BE-7B73-45FA-97F1-84E7E300EC83}.Release|x86.Build.0 = Release|x86
{6A80132D-7306-4E0E-A1AF-146A1C72CF76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6A80132D-7306-4E0E-A1AF-146A1C72CF76}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6A80132D-7306-4E0E-A1AF-146A1C72CF76}.Debug|x86.ActiveCfg = Debug|Any CPU
Expand All @@ -41,6 +33,14 @@ Global
{6A80132D-7306-4E0E-A1AF-146A1C72CF76}.Release|Any CPU.Build.0 = Release|Any CPU
{6A80132D-7306-4E0E-A1AF-146A1C72CF76}.Release|x86.ActiveCfg = Release|Any CPU
{6A80132D-7306-4E0E-A1AF-146A1C72CF76}.Release|x86.Build.0 = Release|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Debug|x86.ActiveCfg = Debug|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Debug|x86.Build.0 = Debug|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Release|Any CPU.Build.0 = Release|Any CPU
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Release|x86.ActiveCfg = Release|x86
{4FC2B9D3-3077-4440-AAF5-D8320A8E940A}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
9 changes: 6 additions & 3 deletions ThinBasic.NET/ThinBasic.NET.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<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.2</PackageReleaseNotes>
<PackageReleaseNotes>1.0.3</PackageReleaseNotes>
<Authors>Jiowcl</Authors>
<PackageProjectUrl>https://github.com/jiowcl/ThinBasic.NET</PackageProjectUrl>
<Platforms>AnyCPU;x86</Platforms>
<Version>1.0.2</Version>
<Version>1.0.3</Version>
<PackageIcon></PackageIcon>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AssemblyVersion>1.0.3.0</AssemblyVersion>
<FileVersion>1.0.3.0</FileVersion>
<SignAssembly>false</SignAssembly>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
Expand Down
6 changes: 3 additions & 3 deletions ThinBasic.NETTests/ThinBasic.NETTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.4" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.4" />
<PackageReference Include="coverlet.collector" Version="3.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit 5b4c534

Please sign in to comment.