Commit graph

9786 commits

Author SHA1 Message Date
Mike Lorbetske
b1fda1c367 Update XLFs 2017-09-29 12:59:44 -07:00
John Beisner
044343f0e9 Fixing a publish break in master: "UploadToLinuxPackageRepository" 2017-09-29 12:40:39 -07:00
Mike Lorbetske
ccbc9f73f7 Update the string that is displayed when there's a typo in the profile name or it's not a valid JSON object 2017-09-29 10:43:01 -07:00
Jan Vorlicek
7826f23d56 Merge pull request #7723 from johnbeisner/RedHat6Enable
Handling the 'badge' naming for RedHat6
2017-09-29 12:32:39 +02:00
dotnet-bot
8632acb6f7 Update CoreSetup to preview1-25728-02 2017-09-28 21:26:29 +00:00
John Beisner
fbb61475f7 Handling the 'badge' naming for RedHat6 2017-09-28 11:19:49 -07:00
John Beisner
a8108c08a1 Merge pull request #7718 from johnbeisner/RedHat6Enable
Adding "rhel.6-x64" to Branding.props
2017-09-28 08:27:54 -07:00
Livar
b7f14949cd Merge pull request #7719 from dotnet-bot/master-UpdateDependencies
Update CoreSetup to preview1-25727-05 (master)
2017-09-27 20:12:13 -07:00
Livar
6ed253299e Merge pull request #7713 from dotnet/merges/release/2.0.0-to-master-20170927-070027
Merge release/2.0.0 to master
2017-09-27 20:11:43 -07:00
Daniel Plaisted
a04b4bf512 Merge pull request #7717 from AndyGerlicher/MSBuild.15.4.8
MSBuild 15.4.8
2017-09-27 17:55:36 -07:00
Livar
68f6619b09 Merge pull request #7720 from livarcocc/updating_branding_155
Updating the branding to 15.5.
2017-09-27 16:57:41 -07:00
Nick Guerrera
a652e6a4fd Port #7594 from master to 2.0.x
Avoid importing incompatible .props files for signing build
2017-09-27 16:55:32 -07:00
Daniel Plaisted
0586375cf8 Avoid importing incompatible .props files for signing build
(cherry picked from commit c2ca512189)
2017-09-27 16:55:00 -07:00
John Beisner
faca86fe62 Adding required environmental variables.
(cherry picked from commit 5000ba5f10)
2017-09-27 16:54:50 -07:00
John Beisner
7b3c1bbb23 Adding consistent "Project" headers to inported props and target files.
(cherry picked from commit 74ad01b576)
2017-09-27 16:54:39 -07:00
Nick Guerrera
e83ae613d6 Fix build errors and warnings after porting fixes to 2.0.x 2017-09-27 16:52:11 -07:00
Livar
5de69a9e0e Merge branch 'master' into merges/release/2.0.0-to-master-20170927-070027 2017-09-27 16:21:19 -07:00
dotnet-bot
05b0a63044 Update CoreSetup to preview1-25727-05 2017-09-27 22:49:00 +00:00
Livar Cunha
19ce791408 Updating the branding to 15.5. 2017-09-27 15:24:22 -07:00
Livar
e55715ab27 Merge pull request #7709 from harshjain2/TP_S124.1
Updated version of TestPlatform to 15.5.0-preview-20170923-02
2017-09-27 14:47:09 -07:00
Nick Guerrera
a298ee9963 Port #7522 from master to 2.0.x
Rearrange output folders
2017-09-27 14:46:25 -07:00
Daniel Plaisted
41695eacb1 Update environment variables for EndToEnd test run on Debian package
(cherry picked from commit 6e0646f7bf)
2017-09-27 14:45:05 -07:00
Daniel Plaisted
e2bd3e3f38 Update signing.proj to use new output paths, and import common repo props
(cherry picked from commit 728cea22f1)
2017-09-27 14:45:05 -07:00
Daniel Plaisted
43febd4e9d Remove duplicate import
(cherry picked from commit 88319a71f3)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
65b0df5b43 Rename output folder from out to bin
(cherry picked from commit 97b7553e31)
2017-09-27 14:45:04 -07:00
Daniel Plaisted
78eb0a7719 Fix test that depended on old output directory layout
(cherry picked from commit 27dc8032dd)
2017-09-27 14:44:16 -07:00
Daniel Plaisted
02a07e6d8e Delete outdated comment
(cherry picked from commit 546eff28c2)
2017-09-27 14:42:05 -07:00
Daniel Plaisted
e60fe42432 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.

(cherry picked from commit ac67434ea4)
2017-09-27 14:40:57 -07:00
Daniel Plaisted
9f3bbc40a2 Use a shorter path for test working directories, get rid of Stage 0 project.json based CLI
(cherry picked from commit 4c3b13e4a8)
2017-09-27 14:40:57 -07:00
Daniel Plaisted
dfe1f69f97 Fix test assets with NuGet.Config files pointing to old layout
(cherry picked from commit fd66cdcc2f)
2017-09-27 14:40:55 -07:00
Daniel Plaisted
7b2eb66236 Fix multiple tests using same output path
(cherry picked from commit 9fb5f746ae)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
21b9a5fb6f Fix test asset that had NuGet.Config pointing to incorrect directory
(cherry picked from commit 103b8a6ec4)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
4cd03dcae4 Use shorter output paths to avoid max path issues on Windows
For example, "out/2" instead of "artifacts/stage2"

(cherry picked from commit dcb3a7ade7)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
b0c4508917 Fix DotNetRestore after merging upstream changes
(cherry picked from commit fc6f2f3bfa)
2017-09-27 14:40:13 -07:00
Daniel Plaisted
ca21dee79a Update MSI tests to use new output directory layout
(cherry picked from commit 2222290394)
2017-09-27 14:37:40 -07:00
Daniel Plaisted
ca34332205 Rename Stage0 build variables to PreviousStage
(cherry picked from commit c6e4c8f477)
2017-09-27 14:37:37 -07:00
Livar Cunha
4bd9bb92cc Merge remote-tracking branch 'dotnet/release/2.0.0' into merges/release/2.0.0-to-master-20170927-070027
* dotnet/release/2.0.0: (29 commits)
  Updating the CLI branding to 2.0.3
  Fixing merges.
  Removing the trailing '\r' for bash shells; commit hash.
  Removing the trailing '\r' for bash shells. https://github.com/dotnet/cli/issues/7392
  Changing ItAddsFxVersionAsAParamWhenTheToolHasThePrefercliruntimeFile to expect 2.0.0 as the runtime version.
  Fixing 'librarypath'
  Update the installation scripts in release/2.0.0 branch.
  Insert SDK 2.0.2-vspre-20170921-5
  Insert SDK 2.0.2-vspre-20170915-1
  MSBuild 15.4.7
  Updating the websdk version to 2.0.0-rel-20170908-653
  Insert NuGet Build 4.4.0-preview3-4475 into cli
  Remove out of support ubuntu1610
  Removing extra line feeds...
  Turning on the NuPkg publishing from Win x86
  The enumeration of the nupkg packages depends on that the creation of packages has already occurred.
  Trivial change to start a VSO build
  Push the 'VS.Redist.Common.Net.Core.SDK*.nupkg' packages to blob storage.
  Remove EOL openSuSE 42.1
  Trigger build
  ...
2017-09-27 14:35:00 -07:00
Daniel Plaisted
c665fd3654 Update expected SDK version test to work with multiple stages
(cherry picked from commit e4777c0b91)
2017-09-27 14:22:29 -07:00
Daniel Plaisted
f39315771e Generate properties to pass to the next stage of the build
(cherry picked from commit 12f8c2377f)
2017-09-27 14:22:19 -07:00
Daniel Plaisted
ee7852a790 Copy empty Directory.Build.props to artifacts folder during build instead of checking it in
(cherry picked from commit 884a48372d)
2017-09-27 14:20:08 -07:00
Daniel Plaisted
dd4a1b5121 Show path when directory delete fails in test setup
(cherry picked from commit 61e68e621a)
2017-09-27 14:20:08 -07:00
Daniel Plaisted
db1dabca9a Use separate folders for different cases of a theory
(cherry picked from commit 4ccf1b6902)
2017-09-27 14:20:08 -07:00
Daniel Plaisted
2b134c91fe Support new artifacts layout in tests and other build logic
(cherry picked from commit 13da213183)
2017-09-27 14:20:05 -07:00
Daniel Plaisted
8385d37185 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly

(cherry picked from commit ae0aa8ed24)
2017-09-27 14:16:37 -07:00
William Li
36ee426998 Port #7571 from master to 2.0.x
Add log to UploadToLinuxPackageRepository

(cherry picked from commit 8b8aef7e44)
2017-09-27 14:10:40 -07:00
William Li
c834676ecb Port #7460 from master to 2.0.x
Use Rest Api to upload to the feed

Add pulling logic to make sure it is uploaded to the feed.

Add retry logic for the whole upload process

Remove the old upload script

(cherry picked from commit 7f54ccb903)
2017-09-27 14:08:31 -07:00
John Beisner
18a79ee291 Adding "rhel.6-x64"
Removing "ubuntu.16.10-x64"
2017-09-27 13:43:24 -07:00
Nick Guerrera
1f21ad0206 Port warning elimination from #7350 from master -> 2.0.x 2017-09-27 13:30:28 -07:00
Nick Guerrera
6fad8be40a Fix warnings in test projects 2017-09-27 13:29:08 -07:00
Nick Guerrera
138b98f65f Use $(CliTargetFramework), eliminate warnings, treat warnings as errors
(cherry picked from commit 656eab7aec)
2017-09-27 13:28:45 -07:00