Commit graph

8670 commits

Author SHA1 Message Date
Peter Huene
da9939e44d
Merge pull request #8907 from peterhuene/no-run-glob
Prevent default item glgobing when evaluating run properties.
2018-03-28 15:06:36 -07:00
Livar
6c3a714b5d
Merge pull request #8852 from dotnet/merges/release/2.1.2xx-to-release/2.1.3xx
Merge release/2.1.2xx to release/2.1.3xx
2018-03-28 10:26:17 -07:00
Livar
f72e6926ca
Merge pull request #8897 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-28 10:11:24 -07:00
John Beisner
1075581fa1
Merge pull request #8912 from johnbeisner/UpdateScript
Fix an 'unbound variable' warning.
2018-03-28 09:43:15 -07:00
Peter Huene
3e575f7a7b
Prevent default item globbing when evaluating run properties.
When `dotnet run` is executed, a project evaluation occurs to obtain properties
related to running the target executable.  Currently, this evaluation causes
the default item globs to be evaluated.  For project directories containing a
large number of files, this can be a bit performance hit since the globbing
happens twice: once for the build and again for evaluating the run properties.

This commit prevents the globbing from taking place when evaluating the run
properties.

Fixes #8103.
2018-03-27 23:46:29 -07:00
Livar
14d24407f7
Merge pull request #8916 from rainersigwald/MSBuild-15.7.127-3xx
MSBuild 15.7.127.34537 for 3xx
2018-03-27 22:12:47 -07:00
Livar
ae08395451
Merge branch 'release/2.1.3xx' into merges/release/2.1.2xx-to-release/2.1.3xx 2018-03-27 16:45:20 -07:00
Livar
538df127f9
Merge pull request #8913 from mairaw/xliff
add xliff scenario
2018-03-27 16:44:42 -07:00
Rainer Sigwald
80eb07bb0d MSBuild 15.7.127.34537 2018-03-27 18:36:20 -05:00
Maira Wenzel
04b3ff3457
add xliff scenario 2018-03-27 14:12:43 -07:00
Maira Wenzel
9b5a41f80b updated xliff files 2018-03-27 14:02:49 -07:00
jbeisner
485638376d Fix an 'unbound variable' warning. 2018-03-27 20:02:41 +00:00
John Beisner
5a5e35cf02
Merge pull request #8902 from rakeshsinghranchi/EnableDotnetInstallToSupportNewDistros
Enabling ubuntu.18.04,opensuse.42.3 and fedora.27 in dotnet-install script
2018-03-27 12:54:17 -07:00
Livar
0b1c9e0436
Merge pull request #8910 from dotnet/prkrishn/update-versions
Update AspNetCore version to 2.1.0-preview2-30475
2018-03-27 12:06:04 -07:00
Pranav K
52b2e4c733
Update AspNetCore version to 2.1.0-preview2-30475 2018-03-27 09:28:10 -07:00
Maira Wenzel
c551b88048 added in use info to the --version option 2018-03-26 18:16:56 -07:00
William Lee
01c11876b0
Better error message to guide user when there is only preview version in the feed (#8905) 2018-03-26 16:24:36 -07:00
William Lee
76d4824c39
Add xml setting version warning (#8860) 2018-03-26 12:50:09 -07:00
Rakesh Ranjan Singh
510cff49d8 Enabling ubuntu.18.04,opensuse.42.3 and fedora.27 in dotnet-install script 2018-03-26 11:28:06 -07:00
Livar
b5a163c7c1
Merge pull request #8884 from rainersigwald/AndyGerlicher-MSBuild-15.7.108
MSBuild 15.7.124 for 2.1.3xx
2018-03-25 19:14:20 -07:00
NuGet Team Bot
fbacb9cd4b Insert NuGet Build 4.7.0-preview3.5039 into cli 2018-03-24 21:33:53 -07:00
Andy Gerlicher
78c3211cc6 MSBuild 15.7.124-preview 2018-03-24 21:19:34 -07:00
Rainer Sigwald
d98928ed21 Keep stdout for test execution
Work around https://github.com/Microsoft/vstest/issues/1503 by using the
MSBuild escape hatch variable MSBUILDENSURESTDOUTFORTASKPROCESSES and
ensuring that tests don't run in a disconnected MSBuild process by
passing /nr:false.
2018-03-24 18:51:59 -05:00
Andy Gerlicher
cd646d2dbc MSBuild 15.7.122-preview 2018-03-24 18:51:49 -05:00
Livar
400e670faa
Merge pull request #8844 from bricelam/ef
Bundle dotnet-ef
2018-03-23 18:57:58 -07:00
Peter Huene
d0780d81e5
Merge pull request #8882 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-23 16:33:06 -07:00
Peter Huene
112926727a
Merge branch 'release/2.1.3xx' into master
* upstream/release/2.1.3xx:
  Try shorter test names
  Fix project type GUIDs when adding projects to solution files.
  Updating the runtime to 2.1.0-preview2-26314-02
  Remove runtime identifiers from the test project
  Update launch settings for ApplicationUrl handling
  Change command order for tools (#8862)
  Update translations following merge with conflicts.
  LOC CHECKIN | cli master | 20180315
  Implement the --tool-path option for the list tool command.
  Ensure tool package store root is a full path.
  Better using facing string (#8809)
  Fix list tool command tests to be localizable.
  Fix #4139 - escape quoted strings for process start
  Generate Microsoft.NETCoreSdk.BundledCliTools.props
2018-03-23 15:17:35 -07:00
Brice Lambson
efa717daaa Bundle dotnet-ef 2018-03-23 13:18:07 -07:00
Livar
14098449e5
Merge pull request #8863 from mlorbetske/dev/mlorbe/UpdatePrecedenceOfAspNetUrlsForLaunchSettings
Update launch settings for ApplicationUrl handling
2018-03-23 13:06:47 -07:00
Mike Lorbetske
eec79d83fc Try shorter test names 2018-03-23 10:30:47 -07:00
Livar
47d0f50938
Merge pull request #8878 from dotnet/update_roslyn
Update Roslyn to 2.8.0-beta3-62722-05
2018-03-23 10:20:44 -07:00
Peter Huene
e61a7a3570
Merge pull request #8796 from peterhuene/project-type-guid
Fix project type GUIDs when adding projects to solution files.
2018-03-22 22:27:01 -07:00
Peter Huene
e30fe29aab
Fix project type GUIDs when adding projects to solution files.
This commit ensures the correct property (`ProjectTypeGuids`) is respected when
adding a project to a solution file.

Additionally, we now error if a project type GUID cannot be determined rather
than incorrectly mapping to the C# project type.

Enabled previously disabled tests that were waiting on upstream changes from
MSBuild and F#.

Fixes #5131.
Fixes #7742.
2018-03-22 21:32:39 -07:00
William Lee
a70485c233
Merge pull request #8880 from dotnet/update_runtime_213xx
Updating the runtime to 2.1.0-preview2-26314-02
2018-03-22 21:14:45 -07:00
Livar
52c73a1e26
Updating the runtime to 2.1.0-preview2-26314-02 2018-03-22 17:16:55 -07:00
Livar
6b15f121f5
Update Roslyn to 2.8.0-beta3-62722-05 2018-03-22 16:21:37 -07:00
Mike Lorbetske
9ea0c38f81 Remove runtime identifiers from the test project 2018-03-22 14:37:05 -07:00
Peter Huene
4c516bc299
Merge 'release/2.1.2xx' into release/2.1.3xx
* upstream/release/2.1.2xx: (31 commits)
  Update SDK to 2.1.100-preview-62721-01
  Updating the branding of the CLI to 2.1.103.
  Updating NuGet to 4.6.1-rtm-5019
  Update SDK to 2.1.200-preview-62717-01
  Updating the SDK to 2.1.200-preview-62716-06.
  Updating the SDK to 2.1.200-preview-62716-04
  Update SDK to 2.1.200-preview-62715-08
  Updating Roslyn to 2.8.0-beta2-62713-11
  Updating the SDK version to 2.1.100-preview-62714-01
  Updating the branding of the CLI to 2.1.102.
  Remove cli-deps from sources.
  Update Roslyn to 2.7.0-beta3-62707-11
  add nuget-build myget feed as source
  Insert NuGet Build 4.7.0-preview1.4982 into cli
  Update to the 15.6 RTM version of the test SDK in templates
  Update to consume aspnetcore 2.0.6-10011
  Updating TestPlatform to 15.6 RTM
  Updating runtime to 2.0.6.
  Update AspNetCore version
  Update the branding of the CLI to 2.1.101
  ...
2018-03-22 13:01:24 -07:00
Livar
4298cde511
Merge pull request #8845 from natemcmaster/obsolete-cli-ref
Generate Microsoft.NETCoreSdk.BundledCliTools.props
2018-03-22 12:51:02 -07:00
John Beisner
f44b0e27a5
Merge pull request #8850 from dotnet/merges/release/2.1.3xx-to-master
Merge release/2.1.3xx to master
2018-03-22 11:36:13 -07:00
John Beisner
03da2a4e19
Merge pull request #8864 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-03-22 09:06:56 -07:00
John Beisner
7bb20759c0
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-03-22 08:32:38 -07:00
Mike Lorbetske
c1fff9649a Update launch settings for ApplicationUrl handling 2018-03-21 21:19:24 -07:00
William Lee
149bdfd0fa
Change command order for tools (#8862)
dotnet install tool -> dotnet tool install
dotnet uninstall tool -> dotnet tool uninstall
dotnet list tool -> dotnet tool list
dotnet update tool -> dotnet tool update
2018-03-21 19:12:32 -07:00
John Beisner
29ca0e29e0
Merge pull request #8859 from dotnet/merges/release/2.1.1xx-to-release/2.1.2xx
Merge release/2.1.1xx to release/2.1.2xx
2018-03-21 10:58:50 -07:00
Peter Huene
56a56aa085
Merge pull request #8856 from peterhuene/release-2.1.3xx-stragglers
Cherry-pick commits from master to release/2.1.3xx
2018-03-21 09:24:58 -07:00
John Beisner
0f54f8b749
Merge branch 'release/2.1.2xx' into merges/release/2.1.1xx-to-release/2.1.2xx 2018-03-21 08:37:52 -07:00
Livar
60218cecb5
Merge pull request #8858 from dotnet/update_sdk
Update SDK to 2.1.100-preview-62721-01
2018-03-21 00:07:42 -07:00
Livar
9b0e592e30
Update SDK to 2.1.100-preview-62721-01 2018-03-20 23:33:21 -07:00
Peter Huene
8e8426848d
Update translations following merge with conflicts.
Updating translation status for resource strings that changed upstream.
2018-03-20 16:55:10 -07:00