diff --git a/.appveyor.yml b/.appveyor.yml index f8d65af7e4..35b1131ac9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,7 +7,7 @@ branches: - /^release\/.*$/ - /^(.*\/)?ci-.*$/ build_script: -- ps: .\run.ps1 default-build +- ps: .\run.ps1 -ci default-build on_finish: - ps: 7z a testlogs.zip testlogs - ps: Push-AppveyorArtifact testlogs.zip @@ -16,8 +16,6 @@ install: clone_depth: 1 environment: global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 ASPNETCORE_TEST_LOG_DIR: $(APPVEYOR_BUILD_FOLDER)\testlogs test: 'off' deploy: 'off' diff --git a/.travis.yml b/.travis.yml index e84ae1c10d..06281bb0ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,6 @@ services: - docker env: global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - SIGNALR_TESTS_VERBOSE: 1 - TRAVIS_NODE_VERSION: 8.9.3 mono: none @@ -28,4 +26,4 @@ before_install: - nvm install $TRAVIS_NODE_VERSION - if test "$TRAVIS_OS_NAME" == "linux"; then docker pull redis; fi script: -- ./build.sh +- ./build.sh --ci diff --git a/client-ts/FunctionalTests/package-lock.json b/client-ts/FunctionalTests/package-lock.json index 86487f2999..ed6372b193 100644 --- a/client-ts/FunctionalTests/package-lock.json +++ b/client-ts/FunctionalTests/package-lock.json @@ -658,4 +658,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/client-ts/rollup-base.js b/client-ts/rollup-base.js index b3f362c439..eea43035bf 100644 --- a/client-ts/rollup-base.js +++ b/client-ts/rollup-base.js @@ -15,7 +15,7 @@ export default function(rootDir, moduleGlobals) { return { input: path.join(rootDir, "dist", "cjs", "browser-index.js"), output: { - file: pkg.browser, + file: pkg.umd, format: "umd", name: pkg.umd_name, sourcemap: true, diff --git a/client-ts/signalr-protocol-msgpack/package.json b/client-ts/signalr-protocol-msgpack/package.json index 5d12414870..b9d7e004c2 100644 --- a/client-ts/signalr-protocol-msgpack/package.json +++ b/client-ts/signalr-protocol-msgpack/package.json @@ -3,9 +3,9 @@ "version": "1.0.0-preview3-t000", "description": "MsgPack Protocol support for ASP.NET Core SignalR", "main": "./dist/cjs/index.js", - "browser": "./dist/browser/signalr-protocol-msgpack.js", "module": "./dist/esm/index.js", "typings": "./dist/esm/index.d.ts", + "umd": "./dist/browser/signalr-protocol-msgpack.js", "umd_name": "signalR.protocols.msgpack", "directories": { "test": "spec" diff --git a/client-ts/signalr/package.json b/client-ts/signalr/package.json index f3fab53656..1f7d155f74 100644 --- a/client-ts/signalr/package.json +++ b/client-ts/signalr/package.json @@ -3,9 +3,9 @@ "version": "1.0.0-preview3-t000", "description": "ASP.NET Core SignalR Client", "main": "./dist/cjs/index.js", - "browser": "./dist/browser/signalr.js", "module": "./dist/esm/index.js", "typings": "./dist/esm/index.d.ts", + "umd": "./dist/browser/signalr.js", "umd_name": "signalR", "directories": { "test": "spec" diff --git a/korebuild-lock.txt b/korebuild-lock.txt index bdaa7048b3..5761519a9c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15726 -commithash:599e691c41f502ed9e062b1822ce13b673fc916e +version:2.1.0-preview3-15744 +commithash:b920ce6c433f8927c42109b21e72110068ee2c2e diff --git a/run.ps1 b/run.ps1 index 27dcf848f8..96c6c54c69 100644 --- a/run.ps1 +++ b/run.ps1 @@ -26,12 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c .PARAMETER Update Updates KoreBuild to the latest version even if a lock file is present. +.PARAMETER Reinstall +Re-installs KoreBuild + .PARAMETER ConfigFile The path to the configuration file that stores values. Defaults to korebuild.json. .PARAMETER ToolsSourceSuffix The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. +.PARAMETER CI +Sets up CI specific settings and variables. + .PARAMETER Arguments Arguments to be passed to the command @@ -65,8 +71,10 @@ param( [string]$ToolsSource, [Alias('u')] [switch]$Update, - [string]$ConfigFile, + [switch]$Reinstall, [string]$ToolsSourceSuffix, + [string]$ConfigFile = $null, + [switch]$CI, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$Arguments ) @@ -93,6 +101,10 @@ function Get-KoreBuild { $version = $version.TrimStart('version:').Trim() $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) + if ($Reinstall -and (Test-Path $korebuildPath)) { + Remove-Item -Force -Recurse $korebuildPath + } + if (!(Test-Path $korebuildPath)) { Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" New-Item -ItemType Directory -Path $korebuildPath | Out-Null @@ -188,7 +200,7 @@ $korebuildPath = Get-KoreBuild Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI Invoke-KoreBuildCommand $Command @Arguments } finally { diff --git a/run.sh b/run.sh index 834961fc3a..4606a42e78 100755 --- a/run.sh +++ b/run.sh @@ -14,10 +14,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" verbose=false update=false +reinstall=false repo_path="$DIR" channel='' tools_source='' tools_source_suffix='' +ci=false # # Functions @@ -38,6 +40,8 @@ __usage() { echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." echo " -u|--update Update to the latest KoreBuild even if the lock file is present." + echo " --reinstall Reinstall KoreBuild." + echo " --ci Apply CI specific settings and environment variables." echo "" echo "Description:" echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." @@ -62,6 +66,10 @@ get_korebuild() { version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" + if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then + rm -rf "$korebuild_path" + fi + { if [ ! -d "$korebuild_path" ]; then mkdir -p "$korebuild_path" @@ -175,6 +183,12 @@ while [[ $# -gt 0 ]]; do -u|--update|-Update) update=true ;; + --reinstall|-[Rr]einstall) + reinstall=true + ;; + --ci) + ci=true + ;; --verbose|-Verbose) verbose=true ;; @@ -227,5 +241,5 @@ fi [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" invoke_korebuild_command "$command" "$@"