From 03b069a81ab923631d22300cf42724eb7e6454f9 Mon Sep 17 00:00:00 2001 From: Mattias Karlsson Date: Wed, 18 Sep 2019 21:46:30 +0200 Subject: [PATCH] Switch from PackageIconUrl to PackageIcon --- GitVersion.yml | 2 +- build.cake | 18 +++- build.config | 3 + build.ps1 | 170 ++++++++++++++++++++++--------------- build.sh | 67 ++++++++++----- global.json | 8 ++ src/LitJson/LitJSON.csproj | 6 +- src/LitJson/litjson.png | Bin 0 -> 3356 bytes 8 files changed, 179 insertions(+), 95 deletions(-) create mode 100644 build.config create mode 100644 global.json create mode 100644 src/LitJson/litjson.png diff --git a/GitVersion.yml b/GitVersion.yml index 78f160e..5d4bd95 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -5,7 +5,7 @@ branches: increment: Patch prevent-increment-of-merged-branch-version: true track-merge-target: false - dev(elop)?(ment)?$: + develop: mode: ContinuousDeployment tag: alpha increment: Minor diff --git a/build.cake b/build.cake index 1c9e264..3330845 100644 --- a/build.cake +++ b/build.cake @@ -1,7 +1,12 @@ +// Install modules +#module nuget:?package=Cake.DotNetTool.Module&version=0.3.0 -#tool "nuget:https://api.nuget.org/v3/index.json?package=GitVersion.CommandLine&version=3.6.2" +// Install tools #tool nuget:?package=NUnit.ConsoleRunner&version=3.4.0 +// Install .NET Core Global tools. +#tool "dotnet:https://api.nuget.org/v3/index.json?package=GitVersion.Tool&version=5.0.1" + /////////////////////////////////////////////////////////////////////////////// // ARGUMENTS /////////////////////////////////////////////////////////////////////////////// @@ -56,7 +61,16 @@ Setup(ctx => if(!IsRunningOnWindows()) { - var frameworkPathOverride = new FilePath(typeof(object).Assembly.Location).GetDirectory().FullPath + "/"; + var frameworkPathOverride = ctx.Environment.Runtime.IsCoreClr + ? new []{ + new DirectoryPath("/Library/Frameworks/Mono.framework/Versions/Current/lib/mono"), + new DirectoryPath("/usr/lib/mono"), + new DirectoryPath("/usr/local/lib/mono") + } + .Select(directory =>directory.Combine("4.5")) + .FirstOrDefault(directory => ctx.DirectoryExists(directory)) + ?.FullPath + "/" + : new FilePath(typeof(object).Assembly.Location).GetDirectory().FullPath + "/"; // Use FrameworkPathOverride when not running on Windows. Information("Build will use FrameworkPathOverride={0} since not building on Windows.", frameworkPathOverride); diff --git a/build.config b/build.config new file mode 100644 index 0000000..fa6b8df --- /dev/null +++ b/build.config @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +CAKE_VERSION=0.34.1 +DOTNET_VERSION=3.0.100-rc1-014190 diff --git a/build.ps1 b/build.ps1 index a944341..781a1ec 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,120 +1,154 @@ -$CakeVersion = "0.25.0" -$DotNetChannel = "LTS"; -$DotNetVersion = "2.1.4"; -$IsRunningOnUnix = [System.Environment]::OSVersion.Platform -eq [System.PlatformID]::Unix +#!/usr/bin/env pwsh +$DotNetInstallerUri = 'https://dot.net/v1/dotnet-install.ps1'; +$DotNetUnixInstallerUri = 'https://dot.net/v1/dotnet-install.sh' +$DotNetChannel = 'LTS' +$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent + +[string] $CakeVersion = '' +[string] $DotNetVersion= '' +foreach($line in Get-Content (Join-Path $PSScriptRoot 'build.config')) +{ + if ($line -like 'CAKE_VERSION=*') { + $CakeVersion = $line.SubString(13) + } + elseif ($line -like 'DOTNET_VERSION=*') { + $DotNetVersion =$line.SubString(15) + } +} + + +if ([string]::IsNullOrEmpty($CakeVersion) -or [string]::IsNullOrEmpty($DotNetVersion)) { + 'Failed to parse Cake / .NET Core SDK Version' + exit 1 +} # Make sure tools folder exists -$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent $ToolPath = Join-Path $PSScriptRoot "tools" if (!(Test-Path $ToolPath)) { Write-Verbose "Creating tools directory..." - New-Item -Path $ToolPath -Type directory | out-null + New-Item -Path $ToolPath -Type Directory -Force | out-null +} + + +if ($PSVersionTable.PSEdition -ne 'Core') { + # Attempt to set highest encryption available for SecurityProtocol. + # PowerShell will not set this by default (until maybe .NET 4.6.x). This + # will typically produce a message for PowerShell v2 (just an info + # message though) + try { + # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) + # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't + # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is + # installed (.NET 4.5 is an in-place upgrade). + [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 + } catch { + Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' + } } ########################################################################### # INSTALL .NET CORE CLI ########################################################################### +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 +$env:DOTNET_CLI_TELEMETRY_OPTOUT=1 +$env:DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=1 + + Function Remove-PathVariable([string]$VariableToRemove) { + $SplitChar = ';' + if ($IsMacOS -or $IsLinux) { + $SplitChar = ':' + } + $path = [Environment]::GetEnvironmentVariable("PATH", "User") if ($path -ne $null) { - $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove } - [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "User") + $newItems = $path.Split($SplitChar, [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove } + [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join($SplitChar, $newItems), "User") } $path = [Environment]::GetEnvironmentVariable("PATH", "Process") if ($path -ne $null) { - $newItems = $path.Split(';', [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove } - [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join(';', $newItems), "Process") + $newItems = $path.Split($SplitChar, [StringSplitOptions]::RemoveEmptyEntries) | Where-Object { "$($_)" -inotlike $VariableToRemove } + [Environment]::SetEnvironmentVariable("PATH", [System.String]::Join($SplitChar, $newItems), "Process") } } # Get .NET Core CLI path if installed. -$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 -$env:DOTNET_CLI_TELEMETRY_OPTOUT=1 -$FoundDotNetCliVersion = $null - - +$FoundDotNetCliVersion = $null; if (Get-Command dotnet -ErrorAction SilentlyContinue) { - $FoundDotNetCliVersion = dotnet --version + $FoundDotNetCliVersion = dotnet --version; } -if($FoundDotNetCliVersion -ne $DotNetVersion) -{ +if($FoundDotNetCliVersion -ne $DotNetVersion) { $InstallPath = Join-Path $PSScriptRoot ".dotnet" - Remove-PathVariable "$InstallPath" - $env:PATH = "$InstallPath;$env:PATH" - if (!(Test-Path $InstallPath)) { - New-Item -ItemType Directory -Force $InstallPath | Out-Null; + New-Item -Path $InstallPath -ItemType Directory -Force | Out-Null; } - [string] $InstalledDotNetVersion = Get-ChildItem -Path ./.dotnet -File ` - | Where-Object { $_.Name -eq 'dotnet' -or $_.Name -eq 'dotnet.exe' } ` - | ForEach-Object { &$_.FullName --version } + if ($IsMacOS -or $IsLinux) { + $ScriptPath = Join-Path $InstallPath 'dotnet-install.sh' + (New-Object System.Net.WebClient).DownloadFile($DotNetUnixInstallerUri, $ScriptPath); + & bash $ScriptPath --version "$DotNetVersion" --install-dir "$InstallPath" --channel "$DotNetChannel" --no-path - if ($InstalledDotNetVersion -eq $DotNetVersion) - { - } - elseif ($IsRunningOnUnix) - { - $DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v2.1.4/scripts/obtain/dotnet-install.sh"; - (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath/dotnet-install.sh"); - sudo bash "$InstallPath/dotnet-install.sh" --version $DotNetVersion --install-dir "$InstallPath" --no-path + Remove-PathVariable "$InstallPath" + $env:PATH = "$($InstallPath):$env:PATH" } - else - { - $DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v2.1.4/scripts/obtain/dotnet-install.ps1"; - (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, "$InstallPath\dotnet-install.ps1"); - & $InstallPath\dotnet-install.ps1 -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath; + else { + $ScriptPath = Join-Path $InstallPath 'dotnet-install.ps1' + (New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, $ScriptPath); + & $ScriptPath -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath; + + Remove-PathVariable "$InstallPath" + $env:PATH = "$InstallPath;$env:PATH" } + $env:DOTNET_ROOT=$InstallPath } ########################################################################### # INSTALL CAKE ########################################################################### -Add-Type -AssemblyName System.IO.Compression.FileSystem -Function Unzip -{ - param([string]$zipfile, [string]$outpath) +# Make sure Cake has been installed. +[string] $CakeExePath = '' +[string] $CakeInstalledVersion = Get-Command dotnet-cake -ErrorAction SilentlyContinue | % {&$_.Source --version} - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $outpath) +if ($CakeInstalledVersion -eq $CakeVersion) { + # Cake found locally + $CakeExePath = (Get-Command dotnet-cake).Source } +else { + $CakePath = [System.IO.Path]::Combine($ToolPath,'.store', 'cake.tool', $CakeVersion) # Old PowerShell versions Join-Path only supports one child path + $CakeExePath = (Get-ChildItem -Path $ToolPath -Filter "dotnet-cake*" -File| ForEach-Object FullName | Select-Object -First 1) -# Make sure Cake has been installed. -$CakePath = Join-Path $ToolPath "Cake.$CakeVersion" -$CakeExePath = Join-Path $CakePath "Cake.exe" -$CakeZipPath = Join-Path $ToolPath "Cake.zip" -if (!(Test-Path $CakeExePath)) { - Write-Host "Installing Cake $CakeVersion..." - (New-Object System.Net.WebClient).DownloadFile("https://www.nuget.org/api/v2/package/Cake/$CakeVersion", $CakeZipPath) - Unzip $CakeZipPath $CakePath - Remove-Item $CakeZipPath + + if ((!(Test-Path -Path $CakePath -PathType Container)) -or (!(Test-Path $CakeExePath -PathType Leaf))) { + + if ((![string]::IsNullOrEmpty($CakeExePath)) -and (Test-Path $CakeExePath -PathType Leaf)) + { + & dotnet tool uninstall --tool-path $ToolPath Cake.Tool + } + + & dotnet tool install --tool-path $ToolPath --version $CakeVersion Cake.Tool + if ($LASTEXITCODE -ne 0) + { + 'Failed to install cake' + exit 1 + } + $CakeExePath = (Get-ChildItem -Path $ToolPath -Filter "dotnet-cake*" -File| ForEach-Object FullName | Select-Object -First 1) + } } ########################################################################### # RUN BUILD SCRIPT ########################################################################### -if ($IsRunningOnUnix) +& "$CakeExePath" ./build.cake --bootstrap +if ($LASTEXITCODE -eq 0) { - & mono "$CakeExePath" --bootstrap - if ($LASTEXITCODE -eq 0) - { - & mono "$CakeExePath" $args - } - exit $LASTEXITCODE + & "$CakeExePath" ./build.cake $args } -else -{ - & "$CakeExePath" --bootstrap - if ($LASTEXITCODE -eq 0) - { - & "$CakeExePath" $args - } - exit $LASTEXITCODE -} \ No newline at end of file +exit $LASTEXITCODE \ No newline at end of file diff --git a/build.sh b/build.sh index b9400df..06bcee8 100755 --- a/build.sh +++ b/build.sh @@ -1,10 +1,15 @@ #!/usr/bin/env bash # Define varibles -CAKE_VERSION=0.25.0 -DOTNET_SDK_VERSION=2.1.4 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source $SCRIPT_DIR/build.config TOOLS_DIR=$SCRIPT_DIR/tools -CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe +CAKE_EXE=$TOOLS_DIR/dotnet-cake +CAKE_PATH=$TOOLS_DIR/.store/cake.tool/$CAKE_VERSION + +if [ "$CAKE_VERSION" = "" ] || [ "$DOTNET_VERSION" = "" ]; then + echo "An error occured while parsing Cake / .NET Core SDK version." + exit 1 +fi # Make sure the tools folder exist. if [ ! -d "$TOOLS_DIR" ]; then @@ -15,35 +20,51 @@ fi # INSTALL .NET CORE CLI ########################################################################### -echo "Installing .NET CLI..." -if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then - mkdir "$SCRIPT_DIR/.dotnet" -fi -curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_SDK_VERSION/scripts/obtain/dotnet-install.sh -sudo bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_SDK_VERSION --install-dir .dotnet --no-path -export PATH="$SCRIPT_DIR/.dotnet":$PATH export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 -"$SCRIPT_DIR/.dotnet/dotnet" --info +export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0 +export DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=2 +DOTNET_INSTALLED_VERSION=$(dotnet --version 2>&1) + +if [ "$DOTNET_VERSION" != "$DOTNET_INSTALLED_VERSION" ]; then + echo "Installing .NET CLI..." + if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then + mkdir "$SCRIPT_DIR/.dotnet" + fi + curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh + bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --install-dir .dotnet --no-path + export PATH="$SCRIPT_DIR/.dotnet":$PATH + export DOTNET_ROOT="$SCRIPT_DIR/.dotnet" +fi ########################################################################### # INSTALL CAKE ########################################################################### -if [ ! -f "$CAKE_EXE" ]; then - echo "Installing Cake $CAKE_VERSION..." - curl -Lsfo Cake.zip "https://www.nuget.org/api/v2/package/Cake/$CAKE_VERSION" && unzip -q Cake.zip -d "$TOOLS_DIR/Cake.$CAKE_VERSION" && rm -f Cake.zip - if [ $? -ne 0 ]; then - echo "An error occured while installing Cake." - exit 1 +CAKE_INSTALLED_VERSION=$(dotnet-cake --version 2>&1) + +if [ "$CAKE_VERSION" != "$CAKE_INSTALLED_VERSION" ]; then + if [ ! -f "$CAKE_EXE" ] || [ ! -d "$CAKE_PATH" ]; then + if [ -f "$CAKE_EXE" ]; then + dotnet tool uninstall --tool-path $TOOLS_DIR Cake.Tool + fi + + echo "Installing Cake $CAKE_VERSION..." + dotnet tool install --tool-path $TOOLS_DIR --version $CAKE_VERSION Cake.Tool + if [ $? -ne 0 ]; then + echo "An error occured while installing Cake." + exit 1 + fi fi -fi -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 + # Make sure that Cake has been installed. + if [ ! -f "$CAKE_EXE" ]; then + echo "Could not find Cake.exe at '$CAKE_EXE'." + exit 1 + fi +else + CAKE_EXE="dotnet-cake" fi ########################################################################### @@ -51,4 +72,4 @@ fi ########################################################################### # Start Cake -(exec mono "$CAKE_EXE" --bootstrap) && (exec mono "$CAKE_EXE" "$@") \ No newline at end of file +(exec "$CAKE_EXE" build.cake --bootstrap) && (exec "$CAKE_EXE" build.cake "$@") \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 0000000..f36e2ea --- /dev/null +++ b/global.json @@ -0,0 +1,8 @@ +{ + "projects": [ + "src" + ], + "sdk": { + "version": "3.0.100-rc1-014190" + } +} \ No newline at end of file diff --git a/src/LitJson/LitJSON.csproj b/src/LitJson/LitJSON.csproj index 10738d5..6b6b853 100644 --- a/src/LitJson/LitJSON.csproj +++ b/src/LitJson/LitJSON.csproj @@ -24,13 +24,17 @@ It's quick and lean, without external dependencies. Leonardo Boshell, Mattias Karlsson and contributors Leonardo Boshell, Mattias Karlsson and contributors Unlicense - https://litjson.net/assets/img/logo.png + litjson.png https://github.com/LitJSON/litjson git JSON;Serializer true + + + + $(DefineConstants);LEGACY C:\Windows\Microsoft.NET\Framework\v2.0.50727 diff --git a/src/LitJson/litjson.png b/src/LitJson/litjson.png new file mode 100644 index 0000000000000000000000000000000000000000..a4c15e5bbd11ae56f6707941c9e5dedfad044e95 GIT binary patch literal 3356 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