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

5194 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eric Erhardt
208776ed69 Merge master into local branch. 2017-02-01 18:39:32 -06:00
Livar
51788928f2 Merge pull request #5550 from mairaw/typos 
fixed typos
 2017-02-01 16:39:27 -08:00
Piotr Puszkiewicz
4c971ceed3 Merge branch 'rel/1.0.0' into patch-2 2017-02-01 16:39:08 -08:00
Livar
260b40456a Merge pull request #5541 from livarcocc/wrong_global_json_folders 
Changing the order in which search paths are added for migration
 2017-02-01 16:36:56 -08:00
Eric Erhardt
a2c1a39d07 Fix projects and tests after merge of rel/1.0.0. 2017-02-01 18:35:52 -06:00
Livar
408a0afe8e Merge branch 'rel/1.0.0' into wrong_global_json_folders 2017-02-01 15:53:10 -08:00
Livar
35547e69e9 Merge pull request #5539 from jonsequitur/msbuild-RestoreSources-escaping 
escape semicolons when forwarding RestoreSources to MSBuild
 2017-02-01 15:52:35 -08:00
Maira Wenzel
b605381165 fixed typos 2017-02-01 15:30:35 -08:00
Satya Madala
fe52fad34a Revert results directory argument changes 2017-02-01 14:55:35 -08:00
Eric Erhardt
70443d5544 Merge pull request #5535 from dotnet/eerhardt-patch-1 
Update Microsoft.NETCore.App to 2.0.0-beta-001450-00
 2017-02-01 16:45:12 -06:00
jonsequitur
905db127a6 use missing package test to verify correct package feed parsing 2017-02-01 14:13:07 -08:00
jonsequitur
667f1cf018 also escape :// 2017-02-01 14:13:07 -08:00
jonsequitur
2ea3af799d escape semicolons when forwarding RestoreSources to MSBuild 2017-02-01 14:13:07 -08:00
Livar
1af25e0fd9 Merge branch 'rel/1.0.0' into wrong_global_json_folders 2017-02-01 14:07:57 -08:00
Justin Goshi
3e07297525 Migration: Remove System.GC.Server from runtimeconfig.template.json and inject ServerGarbageCollection property into the csproj (#5537) 
* Remove runtimeconfig.template.json from templates

* Inject ServerGarbageCollection property
 2017-02-01 14:05:53 -08:00
Eric Erhardt
9404dd2f98 Update MSBuild to 15.2.0-preview-000002-01. 
This contains the fix for https://github.com/Microsoft/msbuild/issues/1634
 2017-02-01 15:59:35 -06:00
Livar Cunha
0c411e7e1f Adding another global.json to a failing test asset. 2017-02-01 13:58:15 -08:00
Eric Erhardt
7543551602 Disable EnsureStageSeparation test until we can get a new stage0 with a new MSBuild that has the appropriate fixes. 2017-02-01 15:46:24 -06:00
Eric Erhardt
9f0bb778a1 Merge rel/1.0.0 into master. 2017-02-01 14:32:59 -06:00
Livar Cunha
0c338ced75 Fixing a failing test. Basically, now that global.json paths have precedence, we were using the CLI global.json and finding the wrong project dependencies. 2017-02-01 12:15:00 -08:00
Livar Cunha
49ae86d09f Fixing new test to work crossplat by calculating path with Path.Combine 2017-02-01 10:33:53 -08:00
Livar Cunha
6a72ec603e Changing the order in which search paths are added for migration and setting the project file path in the ProjectDependency appropriately in the case of csproj and project.json 2017-02-01 10:33:53 -08:00
Livar Cunha
64042937cf Creating the half migrated test asset. 2017-02-01 10:33:53 -08:00
Jon Sequeira
6990c71e84 refresh enumerator when moving to next subcommand (#5533) 2017-01-31 21:31:02 -08:00
Justin Goshi
626c8983c2 Migration: embed compiler resources (#5517) 
* Embed compiler resources

* Fix null ref
 2017-01-31 20:30:37 -08:00
Jon Sequeira
3fce02e583 make InvalidOperationException thrown by RunCommand graceful (#5525) 2017-01-31 18:48:14 -08:00
seancpeters
2d93968a88 New3 integration (#5430) 
* Partial conversion to new3. 2 tests fail due to browserlink not restoring.

* new cache initialization

* More lzma changes, and removed a razor ref from templates

* Ephemeral hive flag added to tests that need it

* Updated the template engine version to build against. Minor code cleanup

* Config changes to make template versions separate from template engine versions

* Changed dotnet new versioning to use Product.Version

* Fixing Archiver.csproj

* Fixing dotnet new test.

* Fix LZMA Package Source Condition

* Workaround for newline differences.

* fixed tests with changed template parameters. Added a new3 template non-match test
 2017-01-31 17:31:37 -08:00
Eric Erhardt
f6a5dd1146 Fix crossgen error on netcoreapp1.0 assemblies. 2017-01-31 15:24:10 -06:00
Piotr Puszkiewicz
1cd9e36f52 Merge branch 'rel/1.0.0' into patch-2 2017-01-31 13:13:29 -08:00
Eric Erhardt
7324aa45d0 Update Microsoft.NETCore.App to 2.0.0-beta-001450-00 2017-01-31 13:11:22 -06:00
Eric Erhardt
41330f072f Merge pull request #5529 from piotrpMSFT/piotrpMSFT/merge/1.0.0-rc3 
Merge 1.0.0-rc3
 2017-01-31 07:45:43 -06:00
Piotr Puszkiewicz
d2035ff036 Merge remote-tracking branch 'refs/remotes/dotnet/rel/1.0.0-rc3' 
Conflicts:
	build/Microsoft.DotNet.Cli.DependencyVersions.props
 2017-01-30 23:27:48 -08:00
Piotr Puszkiewicz
f2cb146f1d Merge branch 'master' into master 2017-01-30 23:05:05 -08:00
Livar
7efa9f082f Merge branch 'rel/1.0.0' into patch-2 2017-01-30 21:32:52 -08:00
Faizan2304
3eee54e4f9 Inserting localize testplatform (#5510) 2017-01-30 21:05:16 -08:00
Ryan Stelly
87e2a56393 use correct description string for dotnet build -h: -c (#5507) 2017-01-30 17:15:44 -08:00
Justin Goshi
1c80899909 dotnet migrate uses the correct TreatWarningsAsErrors property (#5492) 2017-01-30 16:34:19 -08:00
Jon Sequeira
e8c5d23c29 display CommandParsingException gracefully (#5493) 
* display CommandParsing gracefully

This set of changes handles CommandParsingException gracefuly (so as not to show the user a stack trace) and generalizes graceful exception display somewhat away from being type-specific.

* fix compile error by inlining constant

* remove unused test logging
 2017-01-30 14:36:44 -08:00
Eric Erhardt
a4f5f42b74 Merge pull request #5495 from eerhardt/UpdateTemplates20 
Update dotnet new to generate a "2.0" project.
 2017-01-30 16:07:18 -06:00
Jonathan Channon
12addb83b1 Update README.md 2017-01-30 20:25:59 +00:00
Eric Erhardt
cc8e179bf5 Update "new -t lib" to netstandard2.0 2017-01-29 09:46:46 -06:00
Eric Erhardt
fd65cb03b6 Update dotnet new to generate a "2.0" project. 2017-01-29 09:46:46 -06:00
Justin Goshi
5aded80a7b Migration: excluded files need to be removed (#5485) 
* WIP

* Implement Remove attribute

* Enable tests

* Fix test

* Try a shorter test name

* Try more shortened test names

* Shorten some more

* Merge issues

* Try shortinging names more

* Fix test errors related to test asset renaming
 2017-01-28 17:14:17 -08:00
Eric Erhardt
23207df2ae Merge pull request #5503 from eerhardt/FixCrossgen 
Fix crossgen executable permissions
 2017-01-28 14:09:04 -06:00
Eric Erhardt
ef35dbc768 Fix crossgen executable permissions 
Workaround https://github.com/NuGet/Home/issues/4424
 2017-01-28 13:21:16 -06:00
Jonathan Channon
0755e81488 Removed link to preview4 page 2017-01-28 11:35:35 +00:00
Livar
e38bc4950c Migrating Microsoft.NetCore.App and NETStandard.Library to RuntimeFrameworkVersion and NetStandardImplicitPackageVersion, respectively. (#5478) 2017-01-27 19:47:57 -08:00
Rohit Agrawal
4c55fb6211 update nuget and sdk rtm-2241 (#5447) 
* update nuget and sdk rtm-2241

* Applying the no packagereference workaround.

* Fix merge issue

* add comments for restore related workarounds added in test assets
 2017-01-27 19:12:35 -08:00
Krzysztof Wicher
d6d39a5c9d fix 5466: explicity including a file causes a build break (#5475) 
* fix 5466: explicity including a file causes a build break

* fix failing unit tests

* Add unit tests and apply fix also to includeFiles

* apply review feedback
 2017-01-27 18:39:44 -08:00
Piotr Puszkiewicz
ba69c88c79 Work around build test.sln race condition until fixed (#5490) 
* Remove GenerateRuntimeConfigurationFiles from this library

* Disable parallel build of test.sln

* PR feedback
 2017-01-27 17:13:04 -08:00