Skip to content

Commit c921de6

Browse files
GregaMohorkoGregaMohorko
committed
Ported to .NET Standard 2.0.
1 parent 57fb652 commit c921de6

File tree

6 files changed

+41
-165
lines changed

6 files changed

+41
-165
lines changed

‎src/BlueWSClient.NET/BlueWSClient.NET.Test/BlueWSClient.NET.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</ItemGroup>
5757
<ItemGroup>
5858
<ProjectReference Include="..\BlueWSClient.NET\BlueWSClient.NET.csproj">
59-
<Project>{42216f1c-4959-4358-b153-6307083d1404}</Project>
59+
<Project>{dc269351-3713-43ee-80b3-fd3bfe65851f}</Project>
6060
<Name>BlueWSClient.NET</Name>
6161
</ProjectReference>
6262
</ItemGroup>

‎src/BlueWSClient.NET/BlueWSClient.NET.sln

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2010
4+
VisualStudioVersion = 15.0.27130.2026
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWSClient.NET", "BlueWSClient.NET\BlueWSClient.NET.csproj", "{42216F1C-4959-4358-B153-6307083D1404}"
7-
EndProject
86
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWSClient.NET.Test", "BlueWSClient.NET.Test\BlueWSClient.NET.Test.csproj", "{A514A352-F716-4A5B-80F9-35CC2DB00C57}"
97
ProjectSection(ProjectDependencies) = postProject
10-
{42216F1C-4959-4358-B153-6307083D1404} = {42216F1C-4959-4358-B153-6307083D1404}
8+
{DC269351-3713-43EE-80B3-FD3BFE65851F} = {DC269351-3713-43EE-80B3-FD3BFE65851F}
119
EndProjectSection
1210
EndProject
11+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlueWSClient.NET", "BlueWSClient.NET\BlueWSClient.NET.csproj", "{DC269351-3713-43EE-80B3-FD3BFE65851F}"
12+
EndProject
1313
Global
1414
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1515
Debug|Any CPU = Debug|Any CPU
1616
Release|Any CPU = Release|Any CPU
1717
EndGlobalSection
1818
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{42216F1C-4959-4358-B153-6307083D1404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20-
{42216F1C-4959-4358-B153-6307083D1404}.Debug|Any CPU.Build.0 = Debug|Any CPU
21-
{42216F1C-4959-4358-B153-6307083D1404}.Release|Any CPU.ActiveCfg = Release|Any CPU
22-
{42216F1C-4959-4358-B153-6307083D1404}.Release|Any CPU.Build.0 = Release|Any CPU
2319
{A514A352-F716-4A5B-80F9-35CC2DB00C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2420
{A514A352-F716-4A5B-80F9-35CC2DB00C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
2521
{A514A352-F716-4A5B-80F9-35CC2DB00C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
2622
{A514A352-F716-4A5B-80F9-35CC2DB00C57}.Release|Any CPU.Build.0 = Release|Any CPU
23+
{DC269351-3713-43EE-80B3-FD3BFE65851F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
24+
{DC269351-3713-43EE-80B3-FD3BFE65851F}.Debug|Any CPU.Build.0 = Debug|Any CPU
25+
{DC269351-3713-43EE-80B3-FD3BFE65851F}.Release|Any CPU.ActiveCfg = Release|Any CPU
26+
{DC269351-3713-43EE-80B3-FD3BFE65851F}.Release|Any CPU.Build.0 = Release|Any CPU
2727
EndGlobalSection
2828
GlobalSection(SolutionProperties) = preSolution
2929
HideSolutionNode = FALSE

‎src/BlueWSClient.NET/BlueWSClient.NET/BlueWSClient.NET.csproj

Lines changed: 32 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,39 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{42216F1C-4959-4358-B153-6307083D1404}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>BlueWS</RootNamespace>
4+
<TargetFramework>netstandard2.0</TargetFramework>
115
<AssemblyName>BlueWS</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
<DocumentationFile>bin\Debug\BlueWS.xml</DocumentationFile>
24-
<NoWarn>
25-
</NoWarn>
26-
</PropertyGroup>
27-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
<DocumentationFile>bin\Release\BlueWS.xml</DocumentationFile>
35-
</PropertyGroup>
36-
<PropertyGroup>
6+
<RootNamespace>BlueWS</RootNamespace>
7+
<Version>1.2.0.1</Version>
8+
<Title>BlueWS</Title>
9+
<Authors>Grega Mohorko</Authors>
10+
<Company>Grega Mohorko</Company>
11+
<Description>A client library for BlueWS library. Includes logic and utility for calling BlueWS web service actions.</Description>
12+
<Copyright>Copyright © Grega Mohorko 2018</Copyright>
13+
<PackageLicenseUrl>https://github.com/GregaMohorko/BlueWSClient.NET/blob/master/LICENSE</PackageLicenseUrl>
14+
<PackageProjectUrl>https://github.com/GregaMohorko/BlueWSClient.NET</PackageProjectUrl>
15+
<PackageIconUrl>https://raw.githubusercontent.com/GregaMohorko/BlueWS/master/Documentation/Icon/BlueWS.ico</PackageIconUrl>
16+
<PackageTags>EntityFramework Entity Database JSON Criteria Expression TableInheritance ManyToOne OneToMany ManyToMany MySQL</PackageTags>
17+
<PackageReleaseNotes>Ported to .NET Standard 2.0.</PackageReleaseNotes>
18+
<AssemblyVersion>1.2.0.1</AssemblyVersion>
19+
<FileVersion>1.2.0.1</FileVersion>
3720
<SignAssembly>true</SignAssembly>
38-
</PropertyGroup>
39-
<PropertyGroup>
21+
<DelaySign>false</DelaySign>
4022
<AssemblyOriginatorKeyFile>GM.StrongNameKey.snk</AssemblyOriginatorKeyFile>
23+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
4124
</PropertyGroup>
25+
26+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
27+
<DocumentationFile>bin\Release\netstandard2.0\BlueWS.xml</DocumentationFile>
28+
</PropertyGroup>
29+
30+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
31+
<DocumentationFile>bin\Debug\netstandard2.0\BlueWS.xml</DocumentationFile>
32+
</PropertyGroup>
33+
4234
<ItemGroup>
43-
<Reference Include="GM.Utility, Version=1.1.3.0, Culture=neutral, PublicKeyToken=a1ae152199607549, processorArchitecture=MSIL">
44-
<HintPath>..\packages\GM.Utility.1.1.3\lib\net461\GM.Utility.dll</HintPath>
45-
<Private>False</Private>
46-
</Reference>
47-
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
49-
<Private>False</Private>
50-
</Reference>
51-
<Reference Include="System" />
52-
<Reference Include="System.Core" />
53-
<Reference Include="System.Xml.Linq" />
54-
<Reference Include="System.Data.DataSetExtensions" />
55-
<Reference Include="Microsoft.CSharp" />
56-
<Reference Include="System.Data" />
57-
<Reference Include="System.Net.Http" />
58-
<Reference Include="System.Xml" />
59-
</ItemGroup>
60-
<ItemGroup>
61-
<Compile Include="Net\BlueWebClient.cs" />
62-
<Compile Include="Net\HttpMethod.cs" />
63-
<Compile Include="Properties\AssemblyInfo.cs" />
64-
<Compile Include="Requests\PostLoginRequest.cs" />
65-
<Compile Include="Request.cs" />
66-
<Compile Include="WebService.cs" />
67-
</ItemGroup>
68-
<ItemGroup>
69-
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
70-
</ItemGroup>
71-
<ItemGroup>
72-
<None Include="BlueWSClient.NET.licenseheader" />
73-
<None Include="GM.StrongNameKey.snk" />
74-
<None Include="packages.config" />
35+
<PackageReference Include="GM.Utility" Version="1.2.0" />
36+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
7537
</ItemGroup>
76-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
77-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
78-
Other similar extension points exist, see Microsoft.Common.targets.
79-
<Target Name="BeforeBuild">
80-
</Target>
81-
<Target Name="AfterBuild">
82-
</Target>
83-
-->
84-
</Project>
38+
39+
</Project>

‎src/BlueWSClient.NET/BlueWSClient.NET/BlueWSClient.NET.nuspec

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/BlueWSClient.NET/BlueWSClient.NET/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎src/BlueWSClient.NET/BlueWSClient.NET/packages.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)