Commit graph

427 commits

Author SHA1 Message Date
Nick Guerrera
20d4d77586
Merge pull request #7998 from dotnet/release/15.5
Merge release/15.5 to master
2017-11-11 10:15:25 -08:00
Nick Guerrera
1fef760409 Merge remote-tracking branch 'upstream/release/2.0.0' into merges/release/2.0.0-to-release/15.5-20171107-080033 2017-11-07 11:34:13 -08:00
John Beisner
56d94ff68c Changes in the Transport feed DLL requires our response; change DLL version and base URL. 2017-11-06 14:57:55 -08:00
Nick Guerrera
116da0277c Generate symbols for profiling when running crossgen 2017-11-01 17:17:22 -07:00
Livar
3d8ce7574b
Merge pull request #7900 from dotnet/merges/release/15.5-to-master-20171025-065942
Merge release/15.5 to master
2017-10-30 10:56:28 -07:00
Livar
8797fecdbc
Updating the transport feed DLL to 1.0.0-prerelease-02130-01 2017-10-30 10:16:35 -07:00
Livar
103a56803f Merge branch 'master' into merges/release/15.5-to-master-20171025-065942 2017-10-25 10:46:31 -07:00
Peter Huene
03f0c51292 Fix relative path handling on Windows.
On Windows, `PathUtility.GetRelativePath` was not properly handling
paths that differed by case in the drive reference (e.g. "C:\" vs.
"c:\").  The fix was to add the missing case-insensitive comparison
argument.

Replaced uses of `PathUtility.GetRelativePath` with
`Path.GetRelativePath` where possible (requires 2.0.0+).

Additionally, `PathUtility.RemoveExtraPathSeparators` was not handling
paths with drive references on Windows.  If the path contained a drive
reference, the separator between the drive reference and the first part
of the path was removed.  This is due to `Path.Combine` not handling
this case, so an explicit concatenation of the separator was added.

This commit resolves issue #7699.
2017-10-24 11:23:52 -07:00
Livar
835d38b27f Merge branch 'release/15.5' into merges/release/2.0.0-to-release/15.5-20171024-070026 2017-10-24 10:09:16 -07:00
Livar Cunha
e1916cc4dc Merge remote-tracking branch 'dotnet/release/15.5' into merges/release/15.5-to-master-20171016-070031
* dotnet/release/15.5: (21 commits)
  Manually merging some changes that git merged wrong and deleted from the 15.5 branch.
  Separating the 'legacy' URL construction from the 'current' URL construction methods and logic.
  Use temporary path for fake deps.json in test
  Use same build number for roslyn and F# satellites
  Updating Roslyn satellites and SDK versions
  Insert NuGet Build 4.5.0-preview2-4529 into cli
  Update NuGet to 4529 (signed)
  MSBuild 15.5.154
  MSBuild 15.5.153
  removed commented out config I'd meant to remove
  added a way to specify the asp.net template versions
  Porting 'dotnet-install.sh' from CLI:master to CLI:release/2.0.0
  'NuGet.master.config' does not appear to be used.
  Fixed tests
  Update branch info to release/15.5
  Updating the websdk version to 2.0.0-rel-20171010-665
  Insert NuGet Build 4.5.0-preview1-4526 into cli
  Update DependencyVersions.props
  Updated version of TestPlatform to 15.5.0-preview-20170923-02
  MSBuild 15.4.8
  ...
2017-10-16 15:42:40 -07:00
John Beisner
0c4bcdcc55 Enabling the publish of CLI NuPkg to the unified Transport feed. 2017-10-16 14:33:50 -07:00
Nick Guerrera
ddae0875cf Revert release/2.0.0 back to 1bcee43995
There were incorrect merges from release/15.5 to release/2.0.0 since then
2017-10-09 13:55:13 -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
William Lee
85ce73dfb5 Use Newtonsoft.Json for UploadToLinuxPackageRepository (#7745) 2017-10-02 16:39:37 -07:00
Ashley Hauck
97b027b232 Remove CscToolPath 2017-10-02 12:26:52 -07:00
John Beisner
044343f0e9 Fixing a publish break in master: "UploadToLinuxPackageRepository" 2017-09-29 12:40:39 -07:00
John Beisner
fbb61475f7 Handling the 'badge' naming for RedHat6 2017-09-28 11:19:49 -07:00
William Li
a2268990da Replace with all linux distros badge 2017-09-15 09:30:35 -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
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
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
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
William Li
cd963e7bdb Remove out of support ubuntu1610 2017-08-31 16:59:17 -07:00
William Li
7f54ccb903 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
2017-08-30 06:54:34 -07:00
Daniel Plaisted
fc6f2f3bfa Fix DotNetRestore after merging upstream changes 2017-08-28 12:39:12 -07:00
Daniel Plaisted
107252ebe7 Merge upstream changes 2017-08-28 11:09:19 -07:00
Nick Guerrera
0a1be24e2f Use fixed RTM build of PlatformAbstractions from build project 2017-08-25 20:17:32 -07:00
Daniel Plaisted
12f8c2377f Generate properties to pass to the next stage of the build 2017-08-24 15:51:37 -07:00
Daniel Plaisted
13da213183 Support new artifacts layout in tests and other build logic 2017-08-24 15:49:13 -07:00
Daniel Plaisted
ae0aa8ed24 Move dir.props to auto-imported Directory.Build.props
This is necessary for setting the intermediate output path to work correctly
2017-08-24 15:46:45 -07:00
John Doe
8fc8a03081 typo 2017-08-14 21:26:49 -07:00
William Li
1fa454bda4 Ingest new version Aspnet store
Change the url and name accordingly for the name naming convention
2017-08-14 16:05:22 -07:00
Nick Guerrera
a1c423c0f6 Honor UI language override in test runs
Also fix some incorrect unlocalized test expectations that slipped in.
2017-07-18 22:03:31 -07:00
Mike Lorbetske
ea467db3af Update test to pass --no-restore to templates 2017-07-10 16:27:54 -07:00
William Li
bf496a9b12 Update bages to aligan with linux buid definition 2017-06-30 19:33:37 -07:00
Nick Guerrera
cad156947d Merge pull request #7036 from nguerrera/fix-local-tests
Fix test failures in local build due to environment variable filter
2017-06-29 16:47:20 -07:00
Nick Guerrera
59bbc5783f Fix test failures in local build due to environment variable filter 2017-06-29 13:45:01 -07:00
Mike Lorbetske
d8087d35d4 Update engine and templates, update to SetupCrossgen 224 - Coherence 25975 2017-06-29 10:16:02 -07:00
Eric Erhardt
6119a29f83 Reenable UpdateVersionsRepo
Now that https://github.com/dotnet/buildtools/issues/1547 is fixed.
2017-06-23 09:09:56 -05:00
jbeisner
add33234a5 Merge pull request #6857 from johnbeisner/RuntimeCoherence
Enable creation and consumption of a 'coherent' pointer
2017-06-15 10:22:40 -07:00
Livar
47223c9400 Merge pull request #6861 from livarcocc/update_sdk
Updating the SDK. Mostly, had to change PackageTargetFallback to Asse…
2017-06-14 10:34:17 -07:00
John Beisner
af29c61f01 We stopped producing distribution specific assets for Linux; removing the check for existence before publishing to 'latest'. 2017-06-14 09:02:36 -07:00
Livar Cunha
0a4a0a082c Updating the SDK. Mostly, had to change PackageTargetFallback to AssetTargetFallback. 2017-06-14 00:27:26 -07:00
John Beisner
c497bf498f Write a 'latest.coherent.version' file at blob storage so users have a 'coherent' option to SDK installations. 2017-06-13 16:45:29 -07:00
William Li
3419a87d6f Produce RPM packages
Reference from https://github.com/dotnet/core-setup/tree/master/src/pkg/packaging/rpm

The goal is to have parity with Debian,
but does not publish to the feed

When run the script with rhel, it will
produce rpm file in the package step
and publish rpm to the blob storage
2017-06-13 15:00:35 -07:00
Daniel Plaisted
9cd4e5a956 Add Microsoft.NET.Build.Extensions files to package for VS insertion 2017-06-09 11:18:46 -07:00
Livar Cunha
0b19d6889e Updating the vstest.console to use the same runtime that is shipping with the CLI. 2017-06-08 16:45:29 -07:00
Nick Guerrera
a08ebb95a0 Generate equivalent of resx .Designer.cs in build 2017-06-06 21:47:58 -07:00