mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
9908 commits 41 branches 190 tags 96 MiB
Commit graph

9908 commits

This branch
This branch
All branches
Author SHA1 Message Date
William Lee
85ce73dfb5 Use Newtonsoft.Json for UploadToLinuxPackageRepository (#7745) 2017-10-02 16:39:37 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -07:00
Livar
3cebbb4ea3 Merge pull request #7746 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25802-02 (master)
 2017-10-02 16:37:24 -07:00
Livar
d797f2de2c Merge pull request #7311 from khyperia/improve_roslyn 
Improve the way Roslyn is pulled in
 2017-10-02 16:33:56 -07:00
dotnet-bot
ee76f981b4 Update CoreSetup to preview1-25802-02 2017-10-02 22:30:41 +00:00
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -07:00
Livar
72b3867943 Merge pull request #7743 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25802-01 (master)
 2017-10-02 13:50:12 -07:00
Livar
fa9ae3de02 Merge pull request #7731 from AndyGerlicher/MSBuild.15.5.110 
MSBuild 15.5.110
 2017-10-02 13:49:55 -07:00
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
dotnet-bot
1bf3b681e2 Update CoreSetup to preview1-25802-01 2017-10-02 17:27:49 +00:00
John Beisner
22cd85daf6 Merge pull request #7732 from johnbeisner/RedHat6Stuff 
The publish logic needs to change with the addition of RedHat 6.
 2017-10-02 10:14:18 -07:00
Eric Erhardt
a6dceb17b5 Merge pull request #7738 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25801-01 (master)
 2017-10-02 10:09:38 -05:00
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -07:00
dotnet-bot
49794cf29b Update CoreSetup to preview1-25801-01 2017-10-01 18:39:18 +00:00
John Beisner
1dd0e45c91 Merge pull request #7730 from johnbeisner/UploadToLinuxPackageRepositoryError 
Fixing a publish break in master: "UploadToLinuxPackageRepository"
 2017-09-29 17:11:08 -07:00
Livar
0444016d45 Merge pull request #7733 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25729-02 (master)
 2017-09-29 15:57:05 -07:00
Livar
f4f0aeae63 Merge pull request #7729 from mlorbetske/dev/mlorbe/UpdateErrorStringForMisspelledOrCorruptedLaunchProfile 
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 15:35:31 -07:00
dotnet-bot
ce08614bf7 Update CoreSetup to preview1-25729-02 2017-09-29 21:49:46 +00:00
John Beisner
3b7f13e179 The publish logic needs to change with the addition of RedHat 6. 
"IsLinuxDistroSpecific" was used only to decide whether to publish zip/tar files - changes to "PublishArchives" & includes RedHat 6 per 'DerivedHostMachineInfo.props'

"IslinuxPortable" was used to decide, among other things, whether to publish the installer packages - changes to "PublishNativeInstallers" & excludes RedHat 6 per 'DerivedHostMachineInfo.props'
 2017-09-29 13:58:08 -07:00
Nick Guerrera
d2cda77047 Merge pull request #7721 from nguerrera/infra-port 
Port infrastructure improvements from master to dev/release/2.0.0
 2017-09-29 13:54:59 -07:00
Andy Gerlicher
fb67e25cfb MSBuild 15.5.110 2017-09-29 13:31:56 -07:00
Livar
1ce3b0ad69 Merge pull request #7725 from dotnet-bot/master-UpdateDependencies 
Update CoreSetup to preview1-25728-02 (master)
 2017-09-29 13:21:13 -07:00
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