From aa1f2f8193a1f9dcd14fb50b18199c15a6ed8cc4 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 22:46:47 +0200 Subject: [PATCH 1/9] Fix .NET Core solution --- source/ChromeDevTools.Core.sln | 25 +++++++++++++++++++ .../MasterDevs.ChromeDevTools.project.json | 10 -------- 2 files changed, 25 insertions(+), 10 deletions(-) create mode 100644 source/ChromeDevTools.Core.sln delete mode 100644 source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json diff --git a/source/ChromeDevTools.Core.sln b/source/ChromeDevTools.Core.sln new file mode 100644 index 00000000..2aaaa644 --- /dev/null +++ b/source/ChromeDevTools.Core.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.9 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MasterDevs.ChromeDevTools.Core", "ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj", "{FB3B025A-8F5A-4245-8F9F-6F2C977A3136}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FB3B025A-8F5A-4245-8F9F-6F2C977A3136}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FB3B025A-8F5A-4245-8F9F-6F2C977A3136}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FB3B025A-8F5A-4245-8F9F-6F2C977A3136}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FB3B025A-8F5A-4245-8F9F-6F2C977A3136}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {654C75D2-8EB8-44A1-8072-878E8EF8E460} + EndGlobalSection +EndGlobal diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json b/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json deleted file mode 100644 index 3ecf54b7..00000000 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "frameworks": { - "net45": {} - }, - "runtimes": { - "win": {} - }, - "dependencies": { - } -} \ No newline at end of file From 237c6bb682ee29ee0116935079d5e37a19cf4db7 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 22:47:06 +0200 Subject: [PATCH 2/9] Add netstandard2.0 --- source/ChromeDevTools/ChromeSession.cs | 2 +- source/ChromeDevTools/ChromeSessionFactory.cs | 2 +- .../ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/ChromeDevTools/ChromeSession.cs b/source/ChromeDevTools/ChromeSession.cs index c8d6971f..5f81fa07 100644 --- a/source/ChromeDevTools/ChromeSession.cs +++ b/source/ChromeDevTools/ChromeSession.cs @@ -1,4 +1,4 @@ -#if !NETSTANDARD1_5 +#if !NETSTANDARD using MasterDevs.ChromeDevTools.Serialization; using Newtonsoft.Json; using System; diff --git a/source/ChromeDevTools/ChromeSessionFactory.cs b/source/ChromeDevTools/ChromeSessionFactory.cs index 36facc27..fcfcee3f 100644 --- a/source/ChromeDevTools/ChromeSessionFactory.cs +++ b/source/ChromeDevTools/ChromeSessionFactory.cs @@ -1,4 +1,4 @@ -#if !NETSTANDARD1_5 +#if !NETSTANDARD namespace MasterDevs.ChromeDevTools { public class ChromeSessionFactory : IChromeSessionFactory diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj index 198dc156..c967729f 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -1,8 +1,8 @@  - netstandard1.5 - netstandard1.5;net45 + netstandard2.0 + netstandard2.0;netstandard1.5;net45 1.0.3 false @@ -21,10 +21,10 @@ - + @@ -36,6 +36,7 @@ + \ No newline at end of file From 1ab5cf62354aca450ccc8984bd13007231740494 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 22:49:49 +0200 Subject: [PATCH 3/9] Use PackageLicenseExpression --- source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj index c967729f..8189c500 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -12,7 +12,7 @@ MasterDevs Contains the classes and utilities used to interact with the Chrome Developer Tools https://github.com/MasterDevs/ChromeDevTools - https://github.com/MasterDevs/ChromeDevTools/blob/master/LICENSE + MIT http://masterdevs.com/images/FavIcon_144.png true From c3d54aae0f9270234c158f6287a541fd8f21b32e Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 22:54:30 +0200 Subject: [PATCH 4/9] Use NerdBank.GitVersioning to set the package version --- appveyor.yml | 70 +------------------ .../MasterDevs.ChromeDevTools.Core.csproj | 2 +- source/version.json | 7 ++ 3 files changed, 10 insertions(+), 69 deletions(-) create mode 100644 source/version.json diff --git a/appveyor.yml b/appveyor.yml index ce641c07..ba8e01b3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,80 +1,14 @@ # Great reference: http://www.appveyor.com/docs/appveyor-yml -version: 1.0.{build} skip_tags: false -configuration: Release -init: -- ps: >- - $parsedReleaseBuildVersion = $env:APPVEYOR_REPO_TAG_NAME -Match "(\d+.\d+.\d+(.\d+)?)" - - If($env:appveyor_repo_tag -AND $parsedReleaseBuildVersion) { - $env:BuildVersion = $matches[0] - $env:IsGithubRelease = $TRUE - } - else { - $env:BuildVersion = $env:appveyor_build_version - $env:IsGithubRelease = "" - } - - Write-Host "Build Version: " $env:BuildVersion - - Write-Host "appveyor_build_version Variable: " $env:appveyor_build_version - -install: -- ps: >- - try - { - if($env:IsGithubRelease) - { - $origin = git config --get remote.origin.url - if ($origin -like "https://github.com/*.git") - { - $startToTrim = "https://github.com/" - $endToTrim = ".git" - - $releaseUrl = $origin.Substring($startToTrim.Length, $origin.Length - $startToTrim.Length - $endToTrim.Length) - - $releaseUrl = "https://api.github.com/repos/" + $releaseUrl + "/releases/tags/" + $env:APPVEYOR_REPO_TAG_NAME - - $resp = invoke-webrequest $releaseUrl - $release = $resp.Content | ConvertFrom-Json - - $nuspecPath = (Get-ChildItem -Filter *.nuspec -Recurse )[0].FullName - [xml]$nuspec = Get-Content $nuspecPath - - $nuspec.package.metadata.releaseNotes = $release.Body - $nuspec.Save( $nuspecPath ) - } - } - } - catch - { - Write-Host $_.Exception.GetType().FullName, $_.Exception.Message - } -assembly_info: - patch: true - file: '**\AssemblyInfo.*' - assembly_version: $(BuildVersion) - assembly_file_version: $(BuildVersion) - assembly_informational_version: $(BuildVersion) nuget: account_feed: true project_feed: true -before_build: -- cmd: choco install wget -- wget -q https://download.microsoft.com/download/8/F/9/8F9659B9-E628-4D1A-B6BF-C3004C8C954B/dotnet-1.1.1-sdk-win-x64.exe -- dotnet-1.1.1-sdk-win-x64.exe /install /quiet /log dotnetinstall.log -- ps: Push-AppveyorArtifact "dotnetinstall.log" +build: - nuget restore source\MasterDevs.ChromeDevTools.sln - dotnet restore source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj -- dotnet pack source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj --version-suffix r%APPVEYOR_BUILD_NUMBER% -build: - project: source\MasterDevs.ChromeDevTools.sln - publish_nuget: true - publish_nuget_symbols: false - verbosity: minimal +- dotnet pack source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj -c Release artifacts: -- path: '*.nupkg' - path: 'source\ChromeDevTools\bin\Release\*.nupkg' deploy: - provider: GitHub diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj index 8189c500..705fa28c 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -3,7 +3,6 @@ netstandard2.0 netstandard2.0;netstandard1.5;net45 - 1.0.3 false MasterDevs.ChromeDevTools @@ -21,6 +20,7 @@ + diff --git a/source/version.json b/source/version.json new file mode 100644 index 00000000..08220ded --- /dev/null +++ b/source/version.json @@ -0,0 +1,7 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.1", + "publicReleaseRefSpec": [ + "^refs/heads/master$", + ], +} From 91038446d2efd48384abeff85a2e5bcf87957a91 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 22:56:21 +0200 Subject: [PATCH 5/9] Enable SourceLink, publish source packages --- appveyor.yml | 1 + source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ba8e01b3..6f7b7ac4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,7 @@ build: - dotnet pack source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj -c Release artifacts: - path: 'source\ChromeDevTools\bin\Release\*.nupkg' +- path: 'source\ChromeDevTools\bin\Release\*.snupkg' deploy: - provider: GitHub auth_token: diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj index 705fa28c..ce7ccb24 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -10,9 +10,11 @@ MasterDevs Contains the classes and utilities used to interact with the Chrome Developer Tools - https://github.com/MasterDevs/ChromeDevTools MIT http://masterdevs.com/images/FavIcon_144.png + true + true + snupkg true MasterDevs.ChromeDevTools.snk @@ -21,6 +23,7 @@ + From 8368d94e6ccdcd0ba17e6ab2fec2d11d02c3056b Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 22:59:58 +0200 Subject: [PATCH 6/9] Use build script --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6f7b7ac4..ea7df21a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,7 +4,7 @@ skip_tags: false nuget: account_feed: true project_feed: true -build: +build_script: - nuget restore source\MasterDevs.ChromeDevTools.sln - dotnet restore source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj - dotnet pack source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj -c Release From 484c87ec6bab65a76dd14156870520084218330e Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 23:03:57 +0200 Subject: [PATCH 7/9] Remove AssemblyInfo --- .../MasterDevs.ChromeDevTools.Core.csproj | 5 +++- .../ChromeDevTools/Properties/AssemblyInfo.cs | 27 ------------------- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 source/ChromeDevTools/Properties/AssemblyInfo.cs diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj index ce7ccb24..78b73536 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -9,6 +9,9 @@ MasterDevs.ChromeDevTools MasterDevs + MasterDevs + MasterDevs.ChromeWebTools + Copyright © 2015 MasterDevs Contains the classes and utilities used to interact with the Chrome Developer Tools MIT http://masterdevs.com/images/FavIcon_144.png @@ -23,7 +26,7 @@ - + diff --git a/source/ChromeDevTools/Properties/AssemblyInfo.cs b/source/ChromeDevTools/Properties/AssemblyInfo.cs deleted file mode 100644 index 94677c1f..00000000 --- a/source/ChromeDevTools/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Chrome Developer Tools")] -[assembly: AssemblyDescription("Contains the classes and utilities used to interact with the Chrome Developer Tools")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("MasterDevs")] -[assembly: AssemblyProduct("MasterDevs.ChromeWebTools")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: CLSCompliant(true)] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e7da0b93-c53b-4b4e-a873-88490c1e61cc")] - -[assembly: AssemblyVersion("1.0.1")] -[assembly: AssemblyFileVersion("1.0.1")] From aa455a2b509d28ef83548da878ab34bb02408f23 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 23:05:27 +0200 Subject: [PATCH 8/9] Don't use account feed or project feed --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ea7df21a..164657ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,6 @@ # Great reference: http://www.appveyor.com/docs/appveyor-yml skip_tags: false -nuget: - account_feed: true - project_feed: true build_script: - nuget restore source\MasterDevs.ChromeDevTools.sln - dotnet restore source\ChromeDevTools\MasterDevs.ChromeDevTools.Core.csproj From 5c50dd387327952e47929a804bea4148b65440b9 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 29 May 2019 23:11:54 +0200 Subject: [PATCH 9/9] Target all frameworks, reference Microsoft.CSharp --- source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj index 78b73536..84d883b8 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -1,7 +1,6 @@  - netstandard2.0 netstandard2.0;netstandard1.5;net45 false @@ -44,5 +43,6 @@ + \ No newline at end of file