Skip to content

Commit 2e7961c

Browse files
ggeurtskblok
ggeurts
authored and
kblok
committed
Target PuppeteerSharp.AspNetFramework at .NET 4.6.1 (#941)
1 parent 469dd92 commit 2e7961c

File tree

6 files changed

+13
-150
lines changed

6 files changed

+13
-150
lines changed

‎appveyor-fullframework.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,10 @@ before_build:
2424
2525
build:
2626
project: .\lib\PuppeteerSharp.AspNetFramework.sln
27-
publish_nuget: false
27+
publish_nuget: true
2828
include_nuget_references: true
2929
verbosity: minimal
3030
test: off
31-
after_build:
32-
- cmd: >-
33-
nuget pack C:\projects\puppeteer-sharp\lib\PuppeteerSharp.AspNetFramework\PuppeteerSharp.AspNetFramework.csproj -Prop Configuration=Release
3431
artifacts:
3532
- path: PuppeteerSharp.AspNetFramework.*.nupkg
3633
name: PuppeteerSharp.AspNetFramework Package

‎lib/PuppeteerSharp.AspNetFramework.sln‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PuppeteerSharp.TestServer",
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PuppeteerSharp.Tests.DumpIO", "PuppeteerSharp.Tests.DumpIO\PuppeteerSharp.Tests.DumpIO.csproj", "{B1892212-CEE3-4DC3-ADB8-04A2D9A081A0}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PuppeteerSharp.Tests.CloseMe", "PuppeteerSharp.Tests.CloseMe\PuppeteerSharp.Tests.CloseMe.csproj", "{B1B0358F-88A2-4038-9974-7850D906C76B}"
15-
EndProject
1614
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PuppeteerSharp.DevicesFetcher", "PuppeteerSharp.DevicesFetcher\PuppeteerSharp.DevicesFetcher.csproj", "{A500694A-3649-4474-BC71-C835FA19B865}"
1715
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PuppeteerSharp.AspNetFramework", "PuppeteerSharp.AspNetFramework\PuppeteerSharp.AspNetFramework.csproj", "{4B1A22F5-5AFC-4A29-975E-42D9B377D933}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PuppeteerSharp.AspNetFramework", "PuppeteerSharp.AspNetFramework\PuppeteerSharp.AspNetFramework.csproj", "{4B1A22F5-5AFC-4A29-975E-42D9B377D933}"
1917
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,10 +37,6 @@ Global
3937
{B1892212-CEE3-4DC3-ADB8-04A2D9A081A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
4038
{B1892212-CEE3-4DC3-ADB8-04A2D9A081A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
4139
{B1892212-CEE3-4DC3-ADB8-04A2D9A081A0}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{B1B0358F-88A2-4038-9974-7850D906C76B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{B1B0358F-88A2-4038-9974-7850D906C76B}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{B1B0358F-88A2-4038-9974-7850D906C76B}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{B1B0358F-88A2-4038-9974-7850D906C76B}.Release|Any CPU.Build.0 = Release|Any CPU
4640
{A500694A-3649-4474-BC71-C835FA19B865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4741
{A500694A-3649-4474-BC71-C835FA19B865}.Debug|Any CPU.Build.0 = Debug|Any CPU
4842
{A500694A-3649-4474-BC71-C835FA19B865}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎lib/PuppeteerSharp.AspNetFramework/Properties/AssemblyInfo.cs‎

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

‎lib/PuppeteerSharp.AspNetFramework/PuppeteerSharp.AspNetFramework.csproj‎

Lines changed: 11 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,78 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.Net.Sdk">
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4B1A22F5-5AFC-4A29-975E-42D9B377D933}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>PuppeteerSharp.AspNetFramework</RootNamespace>
11-
<AssemblyName>PuppeteerSharp.AspNetFramework</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
<TargetFrameworkProfile />
4+
<TargetFramework>net461</TargetFramework>
5+
<PackOnBuild>true</PackOnBuild>
6+
<PackageVersion>1.12.0</PackageVersion>
7+
<Authors>Darío Kondratiuk</Authors>
8+
<Owners>Darío Kondratiuk</Owners>
9+
<PackageProjectUrl>https://github.com/kblok/puppeteer-sharp</PackageProjectUrl>
10+
<Summary>Puppeteer-Sharp Helpers for ASP.NET Full Framework</Summary>
1611
</PropertyGroup>
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<ItemGroup>
35-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
37-
</Reference>
38-
<Reference Include="Microsoft.Extensions.Logging, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Microsoft.Extensions.Logging.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
40-
</Reference>
41-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
43-
</Reference>
44-
<Reference Include="Microsoft.Extensions.Options, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Microsoft.Extensions.Options.2.0.2\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
46-
</Reference>
47-
<Reference Include="Microsoft.Extensions.Primitives, Version=2.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.0.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
49-
</Reference>
50-
<Reference Include="System" />
51-
<Reference Include="System.Core" />
52-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
53-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
54-
</Reference>
55-
<Reference Include="System.Web" />
56-
<Reference Include="System.Xml.Linq" />
57-
<Reference Include="System.Data.DataSetExtensions" />
58-
<Reference Include="Microsoft.CSharp" />
59-
<Reference Include="System.Data" />
60-
<Reference Include="System.Net.Http" />
61-
<Reference Include="System.Xml" />
62-
</ItemGroup>
6312
<ItemGroup>
64-
<Compile Include="AspNetWebSocketTransport.cs" />
65-
<Compile Include="Properties\AssemblyInfo.cs" />
13+
<ProjectReference Include="..\PuppeteerSharp\PuppeteerSharp.csproj" />
6614
</ItemGroup>
6715
<ItemGroup>
68-
<ProjectReference Include="..\PuppeteerSharp\PuppeteerSharp.csproj">
69-
<Project>{19b9b1ed-af6c-4daf-8b73-401570111f88}</Project>
70-
<Name>PuppeteerSharp</Name>
71-
</ProjectReference>
16+
<Folder Include="Properties\" />
7217
</ItemGroup>
7318
<ItemGroup>
74-
<None Include="package.nuspec" />
75-
<None Include="packages.config" />
19+
<Reference Include="System.Web" />
7620
</ItemGroup>
77-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7821
</Project>

‎lib/PuppeteerSharp.AspNetFramework/package.nuspec‎

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

‎lib/PuppeteerSharp.AspNetFramework/packages.config‎

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

0 commit comments

Comments
 (0)