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

7124 commits

This branch
This branch
All branches
Author SHA1 Message Date
jbeisner
58bdb63c53 Adding the unified transport NuGet feed. 2017-10-09 13:34:24 -07:00
Livar
da92efce24 Merge pull request #7789 from dotnet/merges/release/15.5-to-release/2.0.0-20171009-070027 
Merge release/15.5 to release/2.0.0
 2017-10-09 11:11:03 -07:00
Nick Guerrera
d0013186c7 Merge pull request #7751 from nguerrera/fixup-roslyn-loc 
Update satellite assemblies and fix up roslyn satellite handling
 2017-10-05 11:25:07 -07:00
Livar
7f4095eeb1 Merge pull request #7762 from livarcocc/merge_release155_into_release200 
Merge release/15.5 into release/2.0.0
 2017-10-05 10:25:58 -07:00
Livar Cunha
ed953f6d05 Keeping the branding for release/2.0.0 at 2.0.3. 2017-10-04 18:07:10 -07:00
Livar
19e631ea47 Merge pull request #7757 from livarcocc/revert_runtime_to_200 
Moving the runtime version to 2.0.0 for the SDK.
 2017-10-04 13:25:40 -07:00
Nick Guerrera
8dc87dc8a6 Merge pull request #7755 from nguerrera/infra-label 
Change pre-release label for infrastructure work
 2017-10-03 16:50:24 -07:00
Livar Cunha
e24b53dda7 Moving the runtime version to 2.0.0 for the SDK. 2017-10-03 16:46:15 -07:00
Nick Guerrera
cd68283018 Update cli-deps-satellites 2017-10-03 16:01:08 -07:00
Nick Guerrera
4a2d3fae16 Fix up roslyn satellite assembly handling to match new insertion mechanism 
1. Publish satellites with a separate project and merge the resulting .deps.json
   into (csc|vbc).deps.json

2. Move the build tasks satellites to the correct location next to main assembly
   (one level higher than bincore\)
 2017-10-03 16:00:56 -07:00
Nick Guerrera
f97742aa43 Change pre-release label for infrastructure work 2017-10-03 14:52:13 -07:00
Livar
2d3b8da0b0 Merge pull request #7748 from AndyGerlicher/MSBuild.15.5.113 
MSBuild 15.5.113
 2017-10-03 09:55:17 -07:00
Livar
72f42f9463 Merge pull request #7735 from brettfo/update-fsharp-15.5 
Update FSharp compiler
 2017-10-02 20:43:11 -07:00
Andy Gerlicher
cd9260f467 MSBuild 15.5.113 2017-10-02 19:03:59 -07:00
Brett V. Forsgren
6ccff28e0a Update F# compiler 2017-10-02 16:37:31 -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
Livar
32c0f44129 Merge branch 'release/15.5' into improve_roslyn 2017-10-02 15:13:34 -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
khyperia
04c8a68539 Improve the way Roslyn is pulled in 2017-10-02 08:01:44 -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
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
Mike Lorbetske
b1fda1c367 Update XLFs 2017-09-29 12:59:44 -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
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 Cunha
19ce791408 Updating the branding to 15.5. 2017-09-27 15:24:22 -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
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