diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
index 5e27196..cb9bc82 100644
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ b/.vsts-pipelines/builds/ci-internal.yml
@@ -2,11 +2,13 @@ trigger:
- master
- release/*
+# See https://github.com/aspnet/BuildTools
resources:
repositories:
- repository: buildtools
- type: git
- name: aspnet-BuildTools
+ type: github
+ endpoint: DotNet-Bot GitHub Connection
+ name: aspnet/BuildTools
ref: refs/heads/release/2.2
phases:
@@ -19,65 +21,27 @@ phases:
inputs:
versionSpec: 8.x
-- phase: Mac
- queue: Hosted macOS Preview
- variables:
- DOTNET_HOME: $(Agent.WorkFolder)/.dotnet
- steps:
- - task: NodeTool@0
- displayName: Use Node 8.x
- inputs:
- versionSpec: 8.x
- - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
- displayName: install certs
- env:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- - script: |
- brew cask install google-chrome
- export TEST_CHROME_BINARY=`which google-chrome-stable`
- displayName: Install headless chrome
- - script: ./build.sh -ci
- displayName: Run ./build.sh
-
-# Don't run linux tests for now, they fail
-# - phase: Linux
-# queue: Hosted Linux Preview
-# variables:
-# DOTNET_HOME: $(Agent.WorkFolder)/.dotnet
-# steps:
-# - task: NodeTool@0
-# displayName: Use Node 8.x
-# inputs:
-# versionSpec: 8.x
-# - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
-# displayName: install certs
-# env:
-# DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-# - script: |
-# sudo apt-get update
-# sudo apt-get install -y unzip openjdk-8-jre-headless xvfb libxi6 libgconf-2-4
-
-# sudo curl -sS -o - Https://dll-ssl.google.com/linux/linux_signing_key.pub | apt-key add
-# sudo echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
-# sudo apt-get -y update
-# sudo apt-get -y --allow-unauthenticated install google-chrome-stable
-# displayName: Install headless chrome
-# - script: npm install -g selenium-standalone
-# displayName: Install selenium
-# - script: selenium-standalone install
-# displayName: Install selenium drivers
-# - script: |
-# exit_code=0
-
-# selenium-standalone start &
-
-# cleanup() {
-# kill $!
-# exit $exit_code
-# }
-
-# trap cleanup EXIT
-# ./build.sh -ci
-# exit_code=$?
-# displayName: Start selenium standalone and run ./build.sh
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+ parameters:
+ agentOs: macOS
+ beforeBuild:
+ - task: NodeTool@0
+ displayName: Use Node 8.x
+ inputs:
+ versionSpec: 8.x
+ - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
+ displayName: install certs
+ env:
+ DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+ DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+ parameters:
+ agentOs: Linux
+ beforeBuild:
+ - task: NodeTool@0
+ displayName: Use Node 8.x
+ inputs:
+ versionSpec: 8.x
+ - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
+ displayName: install certs
diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
index 01fb19b..9364044 100644
--- a/.vsts-pipelines/builds/ci-public.yml
+++ b/.vsts-pipelines/builds/ci-public.yml
@@ -21,61 +21,27 @@ phases:
inputs:
versionSpec: 8.x
-- phase: Mac
- queue: Hosted macOS Preview
- variables:
- DOTNET_HOME: $(Agent.WorkFolder)/.dotnet
- steps:
- - task: NodeTool@0
- displayName: Use Node 8.x
- inputs:
- versionSpec: 8.x
- - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
- displayName: install certs
- env:
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
- DOTNET_CLI_TELEMETRY_OPTOUT: 1
- - script: |
- brew cask install google-chrome
- export TEST_CHROME_BINARY=`which google-chrome-stable`
- displayName: Install headless chrome
- - script: ./build.sh -ci
- displayName: Run ./build.sh
-
-# Don't run linux tests for now, they fail
-# - phase: Linux
-# queue: Hosted Linux Preview
-# variables:
-# DOTNET_HOME: $(Agent.WorkFolder)/.dotnet
-# steps:
-# - task: NodeTool@0
-# displayName: Use Node 8.x
-# inputs:
-# versionSpec: 8.x
-# - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
-# displayName: install certs
-# env:
-# DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-# - script: |
-# sudo apt-get update
-# sudo apt-get install -y unzip openjdk-8-jre-headless xvfb libxi6 libgconf-2-4
-
-# sudo curl -sS -o - Https://dll-ssl.google.com/linux/linux_signing_key.pub | apt-key add
-# sudo echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list
-# sudo apt-get -y update
-# sudo apt-get -y --allow-unauthenticated install google-chrome-stable
-# displayName: Install headless chrome
-# - script: |
-# exit_code=0
-
-# selenium-standalone start &
-
-# cleanup() {
-# kill $!
-# exit $exit_code
-# }
-
-# trap cleanup EXIT
-# ./build.sh -ci
-# exit_code=$?
-# displayName: Start selenium standalone and run ./build.sh
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+ parameters:
+ agentOs: macOS
+ beforeBuild:
+ - task: NodeTool@0
+ displayName: Use Node 8.x
+ inputs:
+ versionSpec: 8.x
+ - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
+ displayName: install certs
+ env:
+ DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+ DOTNET_CLI_TELEMETRY_OPTOUT: 1
+
+- template: .vsts-pipelines/templates/phases/default-build.yml@buildtools
+ parameters:
+ agentOs: Linux
+ beforeBuild:
+ - task: NodeTool@0
+ displayName: Use Node 8.x
+ inputs:
+ versionSpec: 8.x
+ - script: ./run.sh install-tools; $(Agent.WorkFolder)/.dotnet/dotnet dev-certs https
+ displayName: install certs
\ No newline at end of file
diff --git a/README.md b/README.md
index fbd681e..ebc7563 100644
--- a/README.md
+++ b/README.md
@@ -10,3 +10,13 @@ This project is part of ASP.NET Core. You can find samples, documentation and ge
- The ASP.NET localhost development certificate must also be installed and trusted or else you'll get a test error "Certificate error: Navigation blocked".
- `build.cmd` (or `build /t:package` to avoid tests) will produce NuGet packages for each class of template in the artifacts directory. These can be installed via `dotnet new -i {nugetpackage path}`
- You also need to get the packages these templates depend on into your package cache or else `dotnet new` restore will fail. The easiest way to get them to run is by letting the build run at least 1 test.
+
+## Running end-to-end tests
+Prerequisites:
+- Install selenium-standalone (requires Java 8 or 9)
+ - Open JDK9
+ - npm install -g selenium-standalone
+ - selenium-standalone install
+- Chrome
+Run `selenium-standalone start`
+Run `build.cmd /t:Test`
diff --git a/build/dependencies.props b/build/dependencies.props
index 15a2b53..dedd671 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -6,6 +6,7 @@
Use this area to provide additional information.
diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/About.cshtml.cs b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/About.cshtml.cs deleted file mode 100644 index 74a71ca..0000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/About.cshtml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc.RazorPages; - -namespace Company.WebApplication1.Pages -{ - public class AboutModel : PageModel - { - public string Message { get; set; } - - public void OnGet() - { - Message = "Your application description page."; - } - } -} diff --git a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Contact.cshtml b/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Contact.cshtml deleted file mode 100644 index b683c82..0000000 --- a/src/Microsoft.DotNet.Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Contact.cshtml +++ /dev/null @@ -1,19 +0,0 @@ -@page -@model ContactModel -@{ - ViewData["Title"] = "Contact"; -} -Learn about building Web apps with ASP.NET Core.
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Remove the bottom border in Firefox 39-.\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Duplicate behavior to the data-* attribute for our tooltip plugin\n\nabbr[title],\nabbr[data-original-title] { // 4\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 1\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\ndfn {\n font-style: italic; // Add the correct font style in Android 4.3-\n}\n\n// stylelint-disable font-weight-notation\nb,\nstrong {\n font-weight: bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n// stylelint-enable font-weight-notation\n\nsmall {\n font-size: 80%; // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n font-size: 75%;\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n font-size: 1em; // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // We have @viewport set which causes scrollbars to overlap content in IE11 and Edge, so\n // we force a non-overlapping, non-auto-hiding scrollbar to counteract.\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `
`s get reset. However, we also reset the\n// bottom margin to use `rem` units instead of `em`.\np {\n margin-top: 0;\n margin-bottom: $paragraph-margin-bottom;\n}\n\n// Abbreviations\n//\n// 1. Remove the bottom border in Firefox 39-.\n// 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.\n// 3. Add explicit cursor to indicate changed behavior.\n// 4. Duplicate behavior to the data-* attribute for our tooltip plugin\n\nabbr[title],\nabbr[data-original-title] { // 4\n text-decoration: underline; // 2\n text-decoration: underline dotted; // 2\n cursor: help; // 3\n border-bottom: 0; // 1\n}\n\naddress {\n margin-bottom: 1rem;\n font-style: normal;\n line-height: inherit;\n}\n\nol,\nul,\ndl {\n margin-top: 0;\n margin-bottom: 1rem;\n}\n\nol ol,\nul ul,\nol ul,\nul ol {\n margin-bottom: 0;\n}\n\ndt {\n font-weight: $dt-font-weight;\n}\n\ndd {\n margin-bottom: .5rem;\n margin-left: 0; // Undo browser default\n}\n\nblockquote {\n margin: 0 0 1rem;\n}\n\ndfn {\n font-style: italic; // Add the correct font style in Android 4.3-\n}\n\n// stylelint-disable font-weight-notation\nb,\nstrong {\n font-weight: bolder; // Add the correct font weight in Chrome, Edge, and Safari\n}\n// stylelint-enable font-weight-notation\n\nsmall {\n font-size: 80%; // Add the correct font size in all browsers\n}\n\n//\n// Prevent `sub` and `sup` elements from affecting the line height in\n// all browsers.\n//\n\nsub,\nsup {\n position: relative;\n font-size: 75%;\n line-height: 0;\n vertical-align: baseline;\n}\n\nsub { bottom: -.25em; }\nsup { top: -.5em; }\n\n\n//\n// Links\n//\n\na {\n color: $link-color;\n text-decoration: $link-decoration;\n background-color: transparent; // Remove the gray background on active links in IE 10.\n -webkit-text-decoration-skip: objects; // Remove gaps in links underline in iOS 8+ and Safari 8+.\n\n @include hover {\n color: $link-hover-color;\n text-decoration: $link-hover-decoration;\n }\n}\n\n// And undo these styles for placeholder links/named anchors (without href)\n// which have not been made explicitly keyboard-focusable (without tabindex).\n// It would be more straightforward to just use a[href] in previous block, but that\n// causes specificity issues in many other styles that are too complex to fix.\n// See https://github.com/twbs/bootstrap/issues/19402\n\na:not([href]):not([tabindex]) {\n color: inherit;\n text-decoration: none;\n\n @include hover-focus {\n color: inherit;\n text-decoration: none;\n }\n\n &:focus {\n outline: 0;\n }\n}\n\n\n//\n// Code\n//\n\npre,\ncode,\nkbd,\nsamp {\n font-family: $font-family-monospace;\n font-size: 1em; // Correct the odd `em` font sizing in all browsers.\n}\n\npre {\n // Remove browser default top margin\n margin-top: 0;\n // Reset browser default of `1em` to use `rem`s\n margin-bottom: 1rem;\n // Don't allow content to break outside\n overflow: auto;\n // We have @viewport set which causes scrollbars to overlap content in IE11 and Edge, so\n // we force a non-overlapping, non-auto-hiding scrollbar to counteract.\n -ms-overflow-style: scrollbar;\n}\n\n\n//\n// Figures\n//\n\nfigure {\n // Apply a consistent margin strategy (matches our type styles).\n margin: 0 0 1rem;\n}\n\n\n//\n// Images and content\n//\n\nimg {\n vertical-align: middle;\n border-style: none; // Remove the border on images inside links in IE 10-.\n}\n\nsvg {\n // Workaround for the SVG overflow bug in IE10/11 is still required.\n // See https://github.com/twbs/bootstrap/issues/26878\n overflow: hidden;\n vertical-align: middle;\n}\n\n\n//\n// Tables\n//\n\ntable {\n border-collapse: collapse; // Prevent double borders\n}\n\ncaption {\n padding-top: $table-cell-padding;\n padding-bottom: $table-cell-padding;\n color: $table-caption-color;\n text-align: left;\n caption-side: bottom;\n}\n\nth {\n // Matches default `