diff --git a/NuGet.config b/NuGet.config index 1b75d58a6a..f56f587302 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,5 +9,6 @@ --> + diff --git a/build.ps1 b/build.ps1 index 6e5a86f93c..86fe4a6c5f 100644 --- a/build.ps1 +++ b/build.ps1 @@ -306,6 +306,7 @@ $MSBuildArguments += "/p:TargetOsName=win" Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { + $env:KOREBUILD_KEEPGLOBALJSON = 1 Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $PSScriptRoot -ConfigFile $ConfigFile -CI:$CI if ($ForceCoreMsbuild) { $global:KoreBuildSettings.MSBuildType = 'core' @@ -315,4 +316,5 @@ try { finally { Remove-Module 'KoreBuild' -ErrorAction Ignore Remove-Item env:DOTNET_HOME + Remove-Item env:KOREBUILD_KEEPGLOBALJSON } diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index a6836228db..8615952bb7 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -14,6 +14,7 @@ + diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index 79f975532f..4138c08933 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -1,11 +1,15 @@ + + + $(PackageId.Replace('@','').Replace('/','-')) $(NormalizedPackageId)-$(PackageVersion).tgz $(MSBuildProjectDirectory)\package.json $(MSBuildProjectDirectory)\obj\ $([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)'))$(Configuration)\ + --frozen-lockfile @@ -13,9 +17,8 @@ - - - + + @@ -28,7 +31,7 @@ - + @@ -50,8 +53,8 @@ - - + + @@ -66,7 +69,7 @@ - + diff --git a/global.json b/global.json index b4fc896ff3..8a1e66d6bf 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview-010184" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-20190219.1" + "Yarn.MSBuild": "1.13.0" } } diff --git a/src/Components/Browser.JS/src/Microsoft.AspNetCore.Components.Browser.JS.npmproj b/src/Components/Browser.JS/src/Microsoft.AspNetCore.Components.Browser.JS.npmproj index f2215281b4..93d6097acf 100644 --- a/src/Components/Browser.JS/src/Microsoft.AspNetCore.Components.Browser.JS.npmproj +++ b/src/Components/Browser.JS/src/Microsoft.AspNetCore.Components.Browser.JS.npmproj @@ -17,8 +17,8 @@ Inputs="@(WebpackInputs)" Outputs="dist\components.webassembly.js;dist\components.server.js"> - - + + diff --git a/src/Components/Browser.JS/src/package.json b/src/Components/Browser.JS/src/package.json index 0a25d7414c..bbbe8e840a 100644 --- a/src/Components/Browser.JS/src/package.json +++ b/src/Components/Browser.JS/src/package.json @@ -1,5 +1,6 @@ { "name": "microsoft.aspnetcore.components.browser.js", + "private": true, "version": "0.0.1", "description": "", "main": "index.js", diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 5a886ef635..c19c9a59fb 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -18,9 +18,12 @@ - - - + + + + + + diff --git a/src/Components/test/E2ETest/package.json b/src/Components/test/E2ETest/package.json index ec0a2b0156..a84e769eb4 100644 --- a/src/Components/test/E2ETest/package.json +++ b/src/Components/test/E2ETest/package.json @@ -3,6 +3,7 @@ "version": "0.0.1", "description": "Not a real package. This file exists only to declare dependencies.", "main": "index.js", + "private": true, "scripts": { "selenium-standalone": "selenium-standalone", "prepare": "selenium-standalone install" diff --git a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj index 4581b617fc..5f99a4e561 100644 --- a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj +++ b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj @@ -14,7 +14,7 @@ - + diff --git a/src/Middleware/CORS/test/FunctionalTests/package.json b/src/Middleware/CORS/test/FunctionalTests/package.json index 11fcdca425..5c179dd000 100644 --- a/src/Middleware/CORS/test/FunctionalTests/package.json +++ b/src/Middleware/CORS/test/FunctionalTests/package.json @@ -1,4 +1,5 @@ { + "private": true, "devDependencies": { "jest": "^23.6.0", "merge": "^1.2.1", diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj index fc460f6afe..27df62162b 100644 --- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj @@ -17,8 +17,15 @@ - - + + + + + + + + + diff --git a/src/Middleware/NodeServices/src/package.json b/src/Middleware/NodeServices/src/package.json index f234bc6063..4cf7243410 100644 --- a/src/Middleware/NodeServices/src/package.json +++ b/src/Middleware/NodeServices/src/package.json @@ -2,6 +2,7 @@ "name": "nodeservices", "version": "1.0.0", "description": "This is not really an NPM package and will not be published. This file exists only to reference compilation tools.", + "private": true, "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj index 94ff1d4f92..3a165db8c5 100644 --- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj @@ -20,8 +20,15 @@ - - + + + + + + + + + diff --git a/src/Middleware/SpaServices/src/package.json b/src/Middleware/SpaServices/src/package.json index 7ee819c781..9e9cd841ac 100644 --- a/src/Middleware/SpaServices/src/package.json +++ b/src/Middleware/SpaServices/src/package.json @@ -2,6 +2,7 @@ "name": "spaservices", "version": "1.0.0", "description": "This is not really an NPM package and will not be published. This file exists only to reference compilation tools.", + "private": true, "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", diff --git a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj index 1a94cfe658..bff023ed16 100644 --- a/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj +++ b/src/SignalR/clients/ts/FunctionalTests/SignalR.Npm.FunctionalTests.npmproj @@ -8,12 +8,10 @@ <_TestSauceArgs>--verbose --no-color --configuration $(Configuration) --sauce-user "$(SauceUser)" --sauce-key "$(SauceKey)" <_TestSauceArgs Condition="'$(BrowserTestHostName)' != ''">$(_TestSauceArgs) --use-hostname "$(BrowserTestHostName)" run test:local -- --no-color --configuration $(Configuration) - - - + @@ -21,21 +19,20 @@ - - + + - + - + WorkingDirectory="$(RepositoryRoot)src/SignalR/clients/ts/FunctionalTests" /> sauce.local diff --git a/src/SignalR/clients/ts/FunctionalTests/package.json b/src/SignalR/clients/ts/FunctionalTests/package.json index 02d0cf30e9..f67658af39 100644 --- a/src/SignalR/clients/ts/FunctionalTests/package.json +++ b/src/SignalR/clients/ts/FunctionalTests/package.json @@ -5,8 +5,8 @@ "description": "", "main": "index.js", "dependencies": { - "@aspnet/signalr": "file:../signalr", - "@aspnet/signalr-protocol-msgpack": "file:../signalr-protocol-msgpack", + "@aspnet/signalr": "link:../signalr", + "@aspnet/signalr-protocol-msgpack": "link:../signalr-protocol-msgpack", "msgpack5": "^4.0.2" }, "devDependencies": { diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md b/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md index 6541df90ac..c4d74f16b5 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/README.md @@ -5,6 +5,10 @@ MsgPack support for SignalR for ASP.NET Core ```bash npm install @aspnet/signalr-protocol-msgpack ``` +or +```bash +yarn add @aspnet/signalr-protocol-msgpack +``` ## Usage diff --git a/src/SignalR/clients/ts/signalr/README.md b/src/SignalR/clients/ts/signalr/README.md index f38a93401e..644e4eb2db 100644 --- a/src/SignalR/clients/ts/signalr/README.md +++ b/src/SignalR/clients/ts/signalr/README.md @@ -5,6 +5,10 @@ JavaScript and TypeScript clients for SignalR for ASP.NET Core ```bash npm install @aspnet/signalr ``` +or +```bash +yarn add @aspnet/signalr +``` ## Usage diff --git a/src/SignalR/clients/ts/signalr/package.json b/src/SignalR/clients/ts/signalr/package.json index cb2f600b2b..288d444f23 100644 --- a/src/SignalR/clients/ts/signalr/package.json +++ b/src/SignalR/clients/ts/signalr/package.json @@ -39,14 +39,14 @@ "src/**/*" ], "devDependencies": { - "es6-promise": "^4.2.2", - "@types/node": "^10.9.4", "@types/eventsource": "^1.0.2", - "@types/request": "^2.47.1" + "@types/node": "^10.9.4", + "@types/request": "^2.47.1", + "es6-promise": "^4.2.2" }, "dependencies": { - "ws": "^6.0.0", "eventsource": "^1.0.7", - "request": "^2.88.0" + "request": "^2.88.0", + "ws": "^6.0.0" } } diff --git a/src/SignalR/docs/JSFunctionalTests.md b/src/SignalR/docs/JSFunctionalTests.md index 27a7392fb4..a7e5a26fd2 100644 --- a/src/SignalR/docs/JSFunctionalTests.md +++ b/src/SignalR/docs/JSFunctionalTests.md @@ -13,7 +13,7 @@ Our JavaScript client functional tests are written using [Jasmine](https://jasmi ### Iterating -The `npm test` command will take a while, because it will build the `clients\ts\signalr`, `clients\ts\signalr-protocol-msgpack` and `clients\ts\FunctionalTests` folders as well as `dotnet build` the `clients\ts\FunctionalTests` folder (to build the server-side components). If you are making changes, it's nice to be able to build only the things you need to build. To skip all the optional build steps, you can run `npm run test:inner` in `clients\ts\FunctionalTests`. This will skip building `clients\ts\signalr` and `clients\signalr-protocol-msgpack` (it will still build the `clients\ts\FunctionalTests` folder). If you make changes to those libraries, you have to manually build those directories. +The `npm test` command will take a while, because it will build the `clients\ts\signalr`, `clients\ts\signalr-protocol-msgpack` and `clients\ts\FunctionalTests` folders as well as `dotnet build` the `clients\ts\FunctionalTests` folder (to build the server-side components). If you are making changes, it's nice to be able to build only the things you need to build. To skip all the optional build steps, you can run `yarn run test:inner` in `clients\ts\FunctionalTests`. This will skip building `clients\ts\signalr` and `clients\signalr-protocol-msgpack` (it will still build the `clients\ts\FunctionalTests` folder). If you make changes to those libraries, you have to manually build those directories. ## Running tests from the browser