Commit graph

7175 commits

Author SHA1 Message Date
Livar Cunha
3efd44f935 Removing Microsoft.DotNet.TestFramework from the product code and from the SDK deployment and moving the code to the test folder. 2017-09-15 09:49:19 -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
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
John Beisner
a8e96e9d52 Adding a Jenkins test leg to master - Spanish. 2017-09-06 16:12: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
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
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
Daniel Plaisted
97b7553e31 Rename output folder from out to bin 2017-09-01 16:43:02 -07:00
Daniel Plaisted
27dc8032dd Fix test that depended on old output directory layout 2017-09-01 13:53:17 -07:00
Daniel Plaisted
546eff28c2 Delete outdated comment 2017-09-01 13:50:01 -07:00
Daniel Plaisted
9b331673fe Merge upstream changes 2017-09-01 13:17:40 -07:00
Nick Guerrera
8ef162fd13 Merge pull request #7579 from dotnet/merges/release/2.0.0-to-master-20170901-070026
Merge release/2.0.0 to master
2017-09-01 13:16:42 -07:00
William Li
8b8aef7e44 Add log to UploadToLinuxPackageRepository 2017-09-01 12:51:38 -07:00
Nick Guerrera
f4f5100af1 Merge pull request #7480 from mikkelbu/list-store-and-help-as-commands
Add store and help to SDK commands
2017-09-01 12:48:58 -07:00
Daniel Plaisted
ac67434ea4 Fix debian package generation
Previously, dotnet-deb-tool-consumer.csproj was copied to the out/artifacts folder before being restored.  This no longer works as it depends on repo properties, and there is a Directory.Build.props in teh out directory to stop projects inside it from getting the repo properties.  So this change restores it in-place instead.
2017-09-01 12:12:10 -07:00
Nick Guerrera
252218c3d0 Merge 'release/2.0.0' into merges/release/2.0.0-to-master-20170901-070026
Conflicts:
	README.md
	build/Branding.props
	build/DependencyVersions.props
	netci.groovy
	test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
	test/dotnet-new.Tests/GivenThatIWantANewApp.cs
2017-09-01 11:55:26 -07:00
Nick Guerrera
fba2302b45 Merge pull request #7554 from seancpeters/update_templates_to_2.1.0_versions
Updating new templates to 2.1.0 versions
2017-09-01 11:32:35 -07:00
Nick Guerrera
ebbee439b6 Merge pull request #7578 from nguerrera/2.0-dependency-versions
Update shared framework dependency for 2.0.x
2017-09-01 11:27:04 -07:00
Nick Guerrera
03293f5b90 Fix test expectation for package restored n new project 2017-08-31 17:56:15 -07:00
Nick Guerrera
3514db05da Update shared framework dependency 2017-08-31 17:09:05 -07:00
Nick Guerrera
be65a53b45 Merge pull request #7576 from wli3/dev/wul/remove1610
Remove out of support ubuntu1610
2017-08-31 17:02:11 -07:00
William Li
cd963e7bdb Remove out of support ubuntu1610 2017-08-31 16:59:17 -07:00
seancpeters
7f3c93cd0c fixed the bug annotation 2017-08-31 16:40:28 -07:00
seancpeters
bb90633cad annotated the commented out test cases related to netstandard2.0 2017-08-31 16:38:33 -07:00
John Beisner
abaf4aebc9 Merge pull request #7572 from johnbeisner/ScriptChanges
Install-script changes
2017-08-31 15:52:37 -07:00
seancpeters
ffdccdfc21 Re-enabling some unit tests that were skipped, but are again valid with net core 2.1 2017-08-31 15:31:44 -07:00
John Beisner
e0172b5689 Changes per code review... 2017-08-31 13:40:32 -07:00
John Beisner
8a150f89a3 Miscellaneous script fixes... 2017-08-31 13:18:42 -07:00
seancpeters
99489cf402 fixed indentation on Nuget.tempaspnetpatch.config 2017-08-31 10:49:37 -07:00
John Beisner
735188e023 Merge pull request #7377 from mikeharder/mikeharder/libcurl
Add prereq check for libcurl
2017-08-31 09:27:22 -07:00
Nick Guerrera
97778cbb85 Merge pull request #7562 from mmitche/remove-421-20
Remove EOL openSuSE 42.1
2017-08-30 12:19:22 -07:00
Nick Guerrera
96de089b60 Merge pull request #7559 from mmitche/remove-421-master
Remove EOL openSuSE 42.1
2017-08-30 11:32:46 -07:00
Matt Mitchell
25d5006276 Remove EOL openSuSE 42.1 2017-08-30 10:14:54 -07:00
Matt Mitchell
4771e30eff Remove EOL openSuSE 42.1 2017-08-30 10:06:19 -07:00
Nick Guerrera
2f5f56973d Merge pull request #7557 from droyad/test-logger-help
Fixed name of the LogFileName
2017-08-30 08:02:27 -07:00