Commit graph

7280 commits

Author SHA1 Message Date
Andy Gerlicher
f71eecfdd3 MSBuild 15.4.7 2017-09-14 11:04:59 -07:00
Vijay Ramakrishnan
c6482b8919 Updating the websdk version to 2.0.0-rel-20170908-653 2017-09-14 10:39:42 -07:00
Livar
fac7481b09 Merge pull request #7651 from harshjain2/testPlatformVersionUpgrade
Updated version of TestPlatform to 15.5.0-preview-20170914-09
2017-09-14 10:21:50 -07:00
Harsh Jain
4eb4cddbb7 Updated version of TestPlatform to 15.5.0-preview-20170914-09 2017-09-14 20:49:31 +05:30
NuGet Team Bot
5ce59a6179 Insert NuGet Build 4.4.0-preview3-4475 into cli 2017-09-13 17:27:51 -07:00
Livar
1214e57242 Merge pull request #7639 from dotnet/merges/release/2.0.0-to-master-20170913-070028
Merge release/2.0.0 to master
2017-09-13 16:58:33 -07:00
Livar
2b7becc720 Merge branch 'master' into merges/release/2.0.0-to-master-20170913-070028 2017-09-13 14:31:20 -07:00
Livar Cunha
9cdb20b7a5 Removing Microsoft.DotNet.Archive from the CLI and instead depending on a nupkg. 2017-09-13 14:04:09 -07:00
Daniel Plaisted
b925a30be2 Merge pull request #7636 from wli3/fix-parser-warning
Do not move forward if there is parsing error
2017-09-12 17:38:07 -07:00
William Li
9c1fa7c9d9 Do not move forward if there is parsing error 2017-09-12 16:54:51 -07:00
Daniel Plaisted
5d4d7bf619 Merge pull request #7632 from dsplaisted/insert-sdk
Insert SDK version 2.0.1-servicing-20170912-1
2017-09-12 15:56:22 -07:00
Daniel Plaisted
f9b576cf5d Insert SDK version 2.0.1-servicing-20170912-1 2017-09-11 18:37:23 -07:00
Daniel Plaisted
6fdc98c23b Merge pull request #7605 from dsplaisted/dev-guide
Add build and test environment setup scripts, update developer guide
2017-09-11 14:47:08 -07:00
John Beisner
8e756edce1 Merge pull request #7613 from johnbeisner/ReadME
Removing references to "Ubuntu 16.10"
2017-09-08 14:48:06 -07:00
John Beisner
2354fc0a78 Merge pull request #7616 from johnbeisner/InstallationDoc
Putting back the valuable one-line installation script examples.
2017-09-08 13:32:55 -07:00
John Beisner
26dba14391 Putting back the valuable one-line installation script examples. 2017-09-07 17:26:01 -07:00
Daniel Plaisted
d6189e64e6 Remove workaround which is no longer necessary 2017-09-07 14:36:42 -07:00
Daniel Plaisted
ec9be1d0d1 Update test environment script to work on Mac OS 2017-09-07 14:36:13 -07:00
John Beisner
558a6efa3b Removing references to "Ubuntu 16.10" 2017-09-07 14:04:25 -07:00
Livar
80c6635fdb Merge pull request #7608 from dotnet/merges/release/2.0.0-to-master-20170907-070027
Merge release/2.0.0 to master
2017-09-07 11:52:46 -07:00
Livar
a8dd209359 Merge branch 'master' into merges/release/2.0.0-to-master-20170907-070027 2017-09-07 11:11:28 -07:00
John Beisner
35793cf406 Merge pull request #7603 from johnbeisner/Jenkins-es
Adding a Jenkins test leg to master - Spanish.
2017-09-07 10:17:43 -07:00
Eric Erhardt
14b70b9e5e Merge pull request #7604 from eerhardt/FixUpdateDependencies
Fix update-dependencies by using the correct TFM.
2017-09-06 20:33:12 -05:00
Daniel Plaisted
987a5da85a Delete old environment scripts which don't appear to be used or up to date 2017-09-06 18:01:39 -07:00
Daniel Plaisted
ce7ff1cf6b Add build and test environment setup scripts, update developer guide 2017-09-06 17:59:04 -07:00
Eric Erhardt
a36d67fe07 Fix update-dependencies by using the correct TFM.
stage0 comes with 2.1 runtime now, so need to use netcoreapp2.1.
2017-09-06 19:55:13 -05:00
Nick Guerrera
21e769a795 Merge pull request #7601 from eerhardt/FixUpdateDependencies
Fix update-dependencies.
2017-09-06 17:37:04 -07:00
Nick Guerrera
6734510020 Merge pull request #7489 from dotnet/dev/nicholg/sdk-servicing
Finalize v2.0.1
2017-09-06 17:36:08 -07:00
John Beisner
a8e96e9d52 Adding a Jenkins test leg to master - Spanish. 2017-09-06 16:12:31 -07:00
Livar Cunha
093512a64e Pinning the package version expected by NewProjectRestoresCorrectPackageVersion to 2.0.0. 2017-09-06 15:40:31 -07:00
Eric Erhardt
0491fd3826 Fix update-dependencies.
Don't import the root Directory.Build.props during update-dependencies because it imports generated .props files that don't exist outside of the build.
2017-09-06 15:27:16 -05:00
Livar Cunha
cbc87958cc Fix implicit Microsoft.NetCore.App version test. 2017-09-06 12:52:19 -07:00
John Beisner
483e03704f Merge pull request #7598 from johnbeisner/RPM-EnvVars
Incorrect token: Installer.RPM.targets
2017-09-06 09:58:26 -07:00
John Beisner
6a76bb8396 Incorrect token. 2017-09-06 08:53:01 -07:00
John Beisner
86732427fa Merge pull request #7594 from dsplaisted/fix-signing
Avoid importing incompatible .props files for signing build
2017-09-05 17:16:26 -07:00
Daniel Plaisted
79ffd86afd Merge branch 'RPM-EnvVars' into fix-signing 2017-09-05 15:39:08 -07:00
Daniel Plaisted
d94a3cd076 Merge branch 'DirProps' into fix-signing 2017-09-05 15:39:02 -07:00
Daniel Plaisted
c2ca512189 Avoid importing incompatible .props files for signing build 2017-09-05 15:10:15 -07:00
John Beisner
5000ba5f10 Adding required environmental variables. 2017-09-05 15:08:42 -07:00
John Beisner
74ad01b576 Adding consistent "Project" headers to inported props and target files. 2017-09-05 14:44:25 -07:00
Nick Guerrera
1c27c27b44 Sign additional files
Some files that get their signature invalidated by crossgen were missing
from the Signing.proj list.

(cherry picked from commit d7665ea316)
2017-09-05 13:30:17 -07:00
Nick Guerrera
8534452274 Bump to stable runtime/framework packages 2017-09-05 13:28:02 -07:00
Nick Guerrera
2269efbbf0 Insert 2.0.1-servicing SDK in to 2.0.1-servcing CLI 2017-09-05 13:27:37 -07:00
John Beisner
4b54152800 Merge pull request #7591 from johnbeisner/master
Stop building "ubuntu_16_10_x64"
2017-09-05 10:13:43 -07:00
John Beisner
47651b6e77 Stop building ubuntu.16.10-x64 2017-09-05 08:44:15 -07:00
John Beisner
7a55e4bbe4 Adding the "ubuntu_16_10_x64" moniker to the badges lookup. 2017-09-05 08:37:53 -07:00
Daniel Plaisted
c266e398cf Merge pull request #7522 from dsplaisted/fix-incremental-build
Rearrange output folders
2017-09-01 19:53:31 -07:00
Daniel Plaisted
6e0646f7bf Update environment variables for EndToEnd test run on Debian package 2017-09-01 18:21:25 -07:00
Daniel Plaisted
728cea22f1 Update signing.proj to use new output paths, and import common repo props 2017-09-01 17:17:33 -07:00
Daniel Plaisted
88319a71f3 Remove duplicate import 2017-09-01 16:43:40 -07:00