| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177 |
- commit d742bea01e2d3179e142d708dc5be18ed2784432
- Author: Nate McMaster (automated) <[email protected]>
- Date: Mon Jul 2 12:40:25 2018 -0700
- [automated] Change default branch to master
- diff --git a/.appveyor.yml b/.appveyor.yml
- index 0d49a01d7f8..77f1912fe4b 100755
- --- a/.appveyor.yml
- +++ b/.appveyor.yml
- @@ -4,7 +4,7 @@ install:
- - ps: Install-Product node 6.9.2 x64
- branches:
- only:
- - - dev
- + - master
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
- build_script:
- diff --git a/.travis.yml b/.travis.yml
- index 7a388983f55..d974c566a3b 100755
- --- a/.travis.yml
- +++ b/.travis.yml
- @@ -19,6 +19,6 @@ script:
- - ./build.sh
- branches:
- only:
- - - dev
- + - master
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
- diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
- index d7ceb763786..c2c5336fd0f 100644
- --- a/.vsts-pipelines/builds/ci-internal.yml
- +++ b/.vsts-pipelines/builds/ci-internal.yml
- @@ -1,5 +1,5 @@
- trigger:
- -- dev
- +- master
- - release/*
-
- resources:
- @@ -7,7 +7,7 @@ resources:
- - repository: buildtools
- type: git
- name: aspnet-BuildTools
- - ref: refs/heads/dev
- + ref: refs/heads/master
-
- phases:
- - template: .vsts-pipelines/templates/project-ci.yml@buildtools
- diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
- index b7f25723f8b..507c89b0250 100644
- --- a/.vsts-pipelines/builds/ci-public.yml
- +++ b/.vsts-pipelines/builds/ci-public.yml
- @@ -1,5 +1,5 @@
- trigger:
- -- dev
- +- master
- - release/*
-
- # See https://github.com/aspnet/BuildTools
- @@ -9,7 +9,7 @@ resources:
- type: github
- endpoint: DotNet-Bot GitHub Connection
- name: aspnet/BuildTools
- - ref: refs/heads/dev
- -
- + ref: refs/heads/master
- +
- phases:
- - template: .vsts-pipelines/templates/project-ci.yml@buildtools
- diff --git a/korebuild.json b/korebuild.json
- index 147edd8750f..f098e7f9a09 100644
- --- a/korebuild.json
- +++ b/korebuild.json
- @@ -1,6 +1,6 @@
- {
- - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- - "channel": "dev",
- + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
- + "channel": "master",
- "toolsets": {
- "nodejs": {
- "required": true,
- diff --git a/run.ps1 b/run.ps1
- index 3b273824681..34604c71758 100644
- --- a/run.ps1
- +++ b/run.ps1
- @@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
- Example config file:
- ```json
- {
- - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
- - "channel": "dev",
- + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
- + "channel": "master",
- "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
- }
- ```
- @@ -192,7 +192,7 @@ if (!$DotNetHome) {
- else { Join-Path $PSScriptRoot '.dotnet'}
- }
-
- -if (!$Channel) { $Channel = 'dev' }
- +if (!$Channel) { $Channel = 'master' }
- if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
-
- # Execute
- diff --git a/run.sh b/run.sh
- index 02aac158742..61f7a533855 100755
- --- a/run.sh
- +++ b/run.sh
- @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
- [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
- fi
-
- -[ -z "$channel" ] && channel='dev'
- +[ -z "$channel" ] && channel='master'
- [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
-
- get_korebuild
- diff --git a/src/Microsoft.AspNetCore.NodeServices/README.md b/src/Microsoft.AspNetCore.NodeServices/README.md
- index c314db36d0d..d7a5acc896e 100644
- --- a/src/Microsoft.AspNetCore.NodeServices/README.md
- +++ b/src/Microsoft.AspNetCore.NodeServices/README.md
- @@ -256,7 +256,7 @@ module.exports = function(result, physicalPath, maxWidth, maxHeight) {
- }
- ```
-
- -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).
- +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).
-
- **Parameters**
-
- diff --git a/src/Microsoft.AspNetCore.SpaServices/README.md b/src/Microsoft.AspNetCore.SpaServices/README.md
- index e7622a43556..8c87cc5870b 100644
- --- a/src/Microsoft.AspNetCore.SpaServices/README.md
- +++ b/src/Microsoft.AspNetCore.SpaServices/README.md
- @@ -223,7 +223,7 @@ npm install --save angular2-universal
-
- 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.
-
- -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.
- +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.
-
- 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.
-
- @@ -299,7 +299,7 @@ If you want to enable server-side prerendering too, follow the same process as d
-
- 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.
-
- -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).
- +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).
-
- 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.
-
- @@ -327,7 +327,7 @@ As a simple example, here's how you can set up Webpack to build TypeScript files
-
- ```
- npm install --save typescript ts-loader
- -```
- +```
-
- And if you don't already have it, you'll find it useful to install the `webpack` command-line tool:
-
- @@ -641,8 +641,8 @@ by using the `HotModuleReplacementClientOptions` property on `WebpackDevMiddlewa
- ```csharp
- app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
- HotModuleReplacement = true,
- - HotModuleReplacementClientOptions = new Dictionary<string, string> {
- - { "reload", "true" },
- + HotModuleReplacementClientOptions = new Dictionary<string, string> {
- + { "reload", "true" },
- },
- });
- ```
|