diff --git a/appveyor.yml b/appveyor.yml index ce641c07..164657ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,81 +1,13 @@ # 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_script: - 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' +- path: 'source\ChromeDevTools\bin\Release\*.snupkg' deploy: - provider: GitHub auth_token: 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/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..84d883b8 100644 --- a/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj +++ b/source/ChromeDevTools/MasterDevs.ChromeDevTools.Core.csproj @@ -1,19 +1,22 @@  - netstandard1.5 - netstandard1.5;net45 - 1.0.3 + netstandard2.0;netstandard1.5;net45 false MasterDevs.ChromeDevTools MasterDevs.ChromeDevTools MasterDevs + MasterDevs + MasterDevs.ChromeWebTools + Copyright © 2015 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 + true + snupkg true MasterDevs.ChromeDevTools.snk @@ -21,10 +24,12 @@ - + + + @@ -36,6 +41,8 @@ + + \ No newline at end of file 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 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")] 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$", + ], +}