Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit d742bea

Browse files
author
Nate McMaster (automated)
committed
[automated] Change default branch to master
1 parent 7a04134 commit d742bea

File tree

9 files changed

+19
-19
lines changed

9 files changed

+19
-19
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ install:
44
- ps: Install-Product node 6.9.2 x64
55
branches:
66
only:
7-
- dev
7+
- master
88
- /^release\/.*$/
99
- /^(.*\/)?ci-.*$/
1010
build_script:

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ script:
1919
- ./build.sh
2020
branches:
2121
only:
22-
- dev
22+
- master
2323
- /^release\/.*$/
2424
- /^(.*\/)?ci-.*$/
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
trigger:
2-
- dev
2+
- master
33
- release/*
44

55
resources:
66
repositories:
77
- repository: buildtools
88
type: git
99
name: aspnet-BuildTools
10-
ref: refs/heads/dev
10+
ref: refs/heads/master
1111

1212
phases:
1313
- template: .vsts-pipelines/templates/project-ci.yml@buildtools

.vsts-pipelines/builds/ci-public.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trigger:
2-
- dev
2+
- master
33
- release/*
44

55
# See https://github.com/aspnet/BuildTools
@@ -9,7 +9,7 @@ resources:
99
type: github
1010
endpoint: DotNet-Bot GitHub Connection
1111
name: aspnet/BuildTools
12-
ref: refs/heads/dev
13-
12+
ref: refs/heads/master
13+
1414
phases:
1515
- template: .vsts-pipelines/templates/project-ci.yml@buildtools

korebuild.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
3-
"channel": "dev",
2+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
3+
"channel": "master",
44
"toolsets": {
55
"nodejs": {
66
"required": true,

run.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
5252
Example config file:
5353
```json
5454
{
55-
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
56-
"channel": "dev",
55+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
56+
"channel": "master",
5757
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
5858
}
5959
```
@@ -192,7 +192,7 @@ if (!$DotNetHome) {
192192
else { Join-Path $PSScriptRoot '.dotnet'}
193193
}
194194

195-
if (!$Channel) { $Channel = 'dev' }
195+
if (!$Channel) { $Channel = 'master' }
196196
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
197197

198198
# Execute

run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then
248248
[ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
249249
fi
250250

251-
[ -z "$channel" ] && channel='dev'
251+
[ -z "$channel" ] && channel='master'
252252
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
253253

254254
get_korebuild

src/Microsoft.AspNetCore.NodeServices/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ module.exports = function(result, physicalPath, maxWidth, maxHeight) {
256256
}
257257
```
258258

259-
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).
259+
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).
260260

261261
**Parameters**
262262

src/Microsoft.AspNetCore.SpaServices/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ npm install --save angular2-universal
223223

224224
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.
225225

226-
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.
226+
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.
227227

228228
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.
229229

@@ -299,7 +299,7 @@ If you want to enable server-side prerendering too, follow the same process as d
299299

300300
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.
301301

302-
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).
302+
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).
303303

304304
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.
305305

@@ -327,7 +327,7 @@ As a simple example, here's how you can set up Webpack to build TypeScript files
327327

328328
```
329329
npm install --save typescript ts-loader
330-
```
330+
```
331331

332332
And if you don't already have it, you'll find it useful to install the `webpack` command-line tool:
333333

@@ -641,8 +641,8 @@ by using the `HotModuleReplacementClientOptions` property on `WebpackDevMiddlewa
641641
```csharp
642642
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
643643
HotModuleReplacement = true,
644-
HotModuleReplacementClientOptions = new Dictionary<string, string> {
645-
{ "reload", "true" },
644+
HotModuleReplacementClientOptions = new Dictionary<string, string> {
645+
{ "reload", "true" },
646646
},
647647
});
648648
```

0 commit comments

Comments
 (0)