- new: Support of netcoreapp3.1 added.

- 1 nuget package package is made for each WSCT.Wrapper.* project.
wsct · Mar 24, 2020 · 519a97c · 519a97c
1 parent b569234
commit 519a97c
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 59 deletions.
diff --git a/WSCT Core.sln.DotSettings b/WSCT Core.sln.DotSettings
@@ -24,6 +24,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

diff --git a/WSCT.Core.ConsoleTests/WSCT.Core.ConsoleTests.csproj b/WSCT.Core.ConsoleTests/WSCT.Core.ConsoleTests.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>3.0.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>3.0.1.0</Version>
     <Copyright>Copyright © Sylvain Vernois 2007</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>

diff --git a/WSCT.Helpers.GUI/WSCT.Helpers.GUI.csproj b/WSCT.Helpers.GUI/WSCT.Helpers.GUI.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>3.0.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>3.0.1.0</Version>
     <Copyright>Copyright © Sylvain Vernois 2010</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>
@@ -13,6 +13,7 @@
     <ApplicationIcon />
     <StartupObject />
     <OutputType>WinExe</OutputType>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\WSCT.Helpers\WSCT.Helpers.csproj" />

diff --git a/WSCT.Wrapper.Desktop/WSCT.Wrapper.Desktop.csproj b/WSCT.Wrapper.Desktop/WSCT.Wrapper.Desktop.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>1.1.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>1.2.0.0</Version>
     <Copyright>Copyright © ENSICAEN / GREYC 2014</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>
@@ -12,8 +12,9 @@
     <Description>WSCT Wrapper for Desktop (Windows, Linux, MacOS).</Description>
     <ApplicationIcon />
     <StartupObject />
-    <AssemblyVersion>1.1.0.0</AssemblyVersion>
-    <FileVersion>1.1.0.0</FileVersion>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReleaseNotes>- Support of netcoreapp3.1 added.</PackageReleaseNotes>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\WSCT.Wrapper.MacOSX\WSCT.Wrapper.MacOSX.csproj" />

diff --git a/WSCT.Wrapper.Desktop/WSCT.Wrapper.Desktop.nuspec b/WSCT.Wrapper.Desktop/WSCT.Wrapper.Desktop.nuspec
diff --git a/WSCT.Wrapper.MacOSX/WSCT.Wrapper.MacOSX.csproj b/WSCT.Wrapper.MacOSX/WSCT.Wrapper.MacOSX.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>1.1.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>1.2.0.0</Version>
     <Copyright>Copyright © ENSICAEN / GREYC 2014</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>
@@ -13,6 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>true</Optimize>

diff --git a/WSCT.Wrapper.PCSCLite32/WSCT.Wrapper.PCSCLite32.csproj b/WSCT.Wrapper.PCSCLite32/WSCT.Wrapper.PCSCLite32.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>1.1.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>1.2.0.0</Version>
     <Copyright>Copyright © ENSICAEN / GREYC 2014</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>
@@ -13,6 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>true</Optimize>

diff --git a/WSCT.Wrapper.PCSCLite64/WSCT.Wrapper.PCSCLite64.csproj b/WSCT.Wrapper.PCSCLite64/WSCT.Wrapper.PCSCLite64.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>1.1.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>1.2.0.0</Version>
     <Copyright>Copyright © ENSICAEN / GREYC 2014</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>
@@ -13,6 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>true</Optimize>

diff --git a/WSCT.Wrapper.WinSCard/WSCT.Wrapper.WinSCard.csproj b/WSCT.Wrapper.WinSCard/WSCT.Wrapper.WinSCard.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
-    <Version>1.1.0.0</Version>
+    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <Version>1.2.0.0</Version>
     <Copyright>Copyright © ENSICAEN / GREYC 2014</Copyright>
     <Product>WSCT</Product>
     <Company>ENSICAEN</Company>
@@ -13,6 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <Optimize>true</Optimize>