JavaScriptServices 1.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177
  1. commit d742bea01e2d3179e142d708dc5be18ed2784432
  2. Author: Nate McMaster (automated) <[email protected]>
  3. Date: Mon Jul 2 12:40:25 2018 -0700
  4. [automated] Change default branch to master
  5. diff --git a/.appveyor.yml b/.appveyor.yml
  6. index 0d49a01d7f8..77f1912fe4b 100755
  7. --- a/.appveyor.yml
  8. +++ b/.appveyor.yml
  9. @@ -4,7 +4,7 @@ install:
  10. - ps: Install-Product node 6.9.2 x64
  11. branches:
  12. only:
  13. - - dev
  14. + - master
  15. - /^release\/.*$/
  16. - /^(.*\/)?ci-.*$/
  17. build_script:
  18. diff --git a/.travis.yml b/.travis.yml
  19. index 7a388983f55..d974c566a3b 100755
  20. --- a/.travis.yml
  21. +++ b/.travis.yml
  22. @@ -19,6 +19,6 @@ script:
  23. - ./build.sh
  24. branches:
  25. only:
  26. - - dev
  27. + - master
  28. - /^release\/.*$/
  29. - /^(.*\/)?ci-.*$/
  30. diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
  31. index d7ceb763786..c2c5336fd0f 100644
  32. --- a/.vsts-pipelines/builds/ci-internal.yml
  33. +++ b/.vsts-pipelines/builds/ci-internal.yml
  34. @@ -1,5 +1,5 @@
  35. trigger:
  36. -- dev
  37. +- master
  38. - release/*
  39. resources:
  40. @@ -7,7 +7,7 @@ resources:
  41. - repository: buildtools
  42. type: git
  43. name: aspnet-BuildTools
  44. - ref: refs/heads/dev
  45. + ref: refs/heads/master
  46. phases:
  47. - template: .vsts-pipelines/templates/project-ci.yml@buildtools
  48. diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
  49. index b7f25723f8b..507c89b0250 100644
  50. --- a/.vsts-pipelines/builds/ci-public.yml
  51. +++ b/.vsts-pipelines/builds/ci-public.yml
  52. @@ -1,5 +1,5 @@
  53. trigger:
  54. -- dev
  55. +- master
  56. - release/*
  57. # See https://github.com/aspnet/BuildTools
  58. @@ -9,7 +9,7 @@ resources:
  59. type: github
  60. endpoint: DotNet-Bot GitHub Connection
  61. name: aspnet/BuildTools
  62. - ref: refs/heads/dev
  63. -
  64. + ref: refs/heads/master
  65. +
  66. phases:
  67. - template: .vsts-pipelines/templates/project-ci.yml@buildtools
  68. diff --git a/korebuild.json b/korebuild.json
  69. index 147edd8750f..f098e7f9a09 100644
  70. --- a/korebuild.json
  71. +++ b/korebuild.json
  72. @@ -1,6 +1,6 @@
  73. {
  74. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  75. - "channel": "dev",
  76. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  77. + "channel": "master",
  78. "toolsets": {
  79. "nodejs": {
  80. "required": true,
  81. diff --git a/run.ps1 b/run.ps1
  82. index 3b273824681..34604c71758 100644
  83. --- a/run.ps1
  84. +++ b/run.ps1
  85. @@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
  86. Example config file:
  87. ```json
  88. {
  89. - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
  90. - "channel": "dev",
  91. + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
  92. + "channel": "master",
  93. "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
  94. }
  95. ```
  96. @@ -192,7 +192,7 @@ if (!$DotNetHome) {
  97. else { Join-Path $PSScriptRoot '.dotnet'}
  98. }
  99. -if (!$Channel) { $Channel = 'dev' }
  100. +if (!$Channel) { $Channel = 'master' }
  101. if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
  102. # Execute
  103. diff --git a/run.sh b/run.sh
  104. index 02aac158742..61f7a533855 100755
  105. --- a/run.sh
  106. +++ b/run.sh
  107. @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
  108. [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
  109. fi
  110. -[ -z "$channel" ] && channel='dev'
  111. +[ -z "$channel" ] && channel='master'
  112. [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
  113. get_korebuild
  114. diff --git a/src/Microsoft.AspNetCore.NodeServices/README.md b/src/Microsoft.AspNetCore.NodeServices/README.md
  115. index c314db36d0d..d7a5acc896e 100644
  116. --- a/src/Microsoft.AspNetCore.NodeServices/README.md
  117. +++ b/src/Microsoft.AspNetCore.NodeServices/README.md
  118. @@ -256,7 +256,7 @@ module.exports = function(result, physicalPath, maxWidth, maxHeight) {
  119. }
  120. ```
  121. -There's a working image resizing example following this approach [here](https://github.com/aspnet/JavaScriptServices/tree/dev/samples/misc/NodeServicesExamples) - see the [C# code](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/misc/NodeServicesExamples/Controllers/ResizeImage.cs) and the [JavaScript code](https://github.com/aspnet/JavaScriptServices/blob/dev/samples/misc/NodeServicesExamples/Node/resizeImage.js).
  122. +There's a working image resizing example following this approach [here](../../samples/misc/NodeServicesExamples) - see the [C# code](../../samples/misc/NodeServicesExamples/Controllers/ResizeImage.cs) and the [JavaScript code](../../samples/misc/NodeServicesExamples/Node/resizeImage.js).
  123. **Parameters**
  124. diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md
  125. index e7622a43556..8c87cc5870b 100644
  126. --- a/src/Microsoft.AspNetCore.SpaServices/README.md
  127. +++ b/src/Microsoft.AspNetCore.SpaServices/README.md
  128. @@ -223,7 +223,7 @@ npm install --save angular2-universal
  129. Now you can use the [`angular2-universal` APIs](https://github.com/angular/universal) from your `boot-server.ts` TypeScript module to execute your Angular component on the server. The code needed for this is fairly complex, but that's unavoidable because Angular supports so many different ways of being configured, and you need to provide wiring for whatever combination of DI modules you're using.
  130. -You can find an example `boot-server.ts` that renders arbitrary Angular components [here](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/AngularSpa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular component depends on.
  131. +You can find an example `boot-server.ts` that renders arbitrary Angular components [here](../../templates/AngularSpa/ClientApp/boot-server.ts). If you use this with your own application, you might need to edit the `serverBindings` array to reference any other DI services that your Angular component depends on.
  132. The easiest way to get started with Angular server-side rendering on ASP.NET Core is to use the [aspnetcore-spa generator](http://blog.stevensanderson.com/2016/05/02/angular2-react-knockout-apps-on-aspnet-core/), which creates a ready-made working starting point.
  133. @@ -299,7 +299,7 @@ If you want to enable server-side prerendering too, follow the same process as d
  134. The above example is extremely simple - it doesn't use `react-router`, and it doesn't load any data asynchronously. Real applications are likely to do both of these.
  135. -For an example server-side boot module that knows how to evaluate `react-router` routes and render the correct React component, see [this example](https://github.com/aspnet/JavaScriptServices/blob/dev/templates/ReactReduxSpa/ClientApp/boot-server.tsx).
  136. +For an example server-side boot module that knows how to evaluate `react-router` routes and render the correct React component, see [this example](../../templates/ReactReduxSpa/ClientApp/boot-server.tsx).
  137. Supporting asynchronous data loading involves more considerations. Unlike Angular applications that run asynchronously on the server and freely overwrite server-generated markup with client-generated markup, React strictly wants to run synchronously on the server and always produce the same markup on the server as it does on the client.
  138. @@ -327,7 +327,7 @@ As a simple example, here's how you can set up Webpack to build TypeScript files
  139. ```
  140. npm install --save typescript ts-loader
  141. -```
  142. +```
  143. And if you don't already have it, you'll find it useful to install the `webpack` command-line tool:
  144. @@ -641,8 +641,8 @@ by using the `HotModuleReplacementClientOptions` property on `WebpackDevMiddlewa
  145. ```csharp
  146. app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
  147. HotModuleReplacement = true,
  148. - HotModuleReplacementClientOptions = new Dictionary<string, string> {
  149. - { "reload", "true" },
  150. + HotModuleReplacementClientOptions = new Dictionary<string, string> {
  151. + { "reload", "true" },
  152. },
  153. });
  154. ```