Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into Restore3 #150

Merged
merged 8 commits into from
Sep 19, 2016
Merged

Merge master into Restore3 #150

merged 8 commits into from
Sep 19, 2016

Conversation

natidea
Copy link
Contributor

@natidea natidea commented Sep 19, 2016

@srivatsn
Copy link
Contributor

👍

@natidea natidea merged commit 660bc07 into Restore3 Sep 19, 2016
nguerrera pushed a commit that referenced this pull request Oct 10, 2016
Merge master into Restore3
sbomer pushed a commit to sbomer/sdk that referenced this pull request Sep 19, 2017
Fix task/target name HandlePackageFileConflicts
GangWang01 pushed a commit to GangWang01/sdk that referenced this pull request Jun 27, 2022
* Tags become choices, lots of help changes

* Rebased on rel/sv2017/post-rtw

* Post-Rebase cleanup of outputs for various situations. Moved tags to symbols on 2.0 templates

* Reverted to tags in 1.x templates and Item templates

* Removed extra space from tags secifications in 1.x templates

* Reverted to tags in 2.0 templates

* Fixed misspelling of 'language' in 2.0 template.json files

* Changes based on review comments (not including case-insensitive reads yet)

* Rebased on rel/vs2017/post-rtw

* Made reading template config & cache info be case-insensitive.

* Made cache parameter properties get only

* Cleanup of help & ItemplateInfo

* Minor cleanup, mostly removing no longer needed async tasks

* More cleanup

* Tags become choices, lots of help changes

* Rebased on rel/sv2017/post-rtw

* Post-Rebase cleanup of outputs for various situations. Moved tags to symbols on 2.0 templates

* Reverted to tags in 1.x templates and Item templates

* Removed extra space from tags secifications in 1.x templates

* Reverted to tags in 2.0 templates

* Fixed misspelling of 'language' in 2.0 template.json files

* Cleaning up UI interactions. Better experience for: problems with extra args files (dotnet#327, dotnet#329); default not in choice list dotnet#271

* Added support for split template configuration files (dotnet#150)

* Cleanup of nulls in the template cache

* fixed a merge mistake

* More fixes from merge issues

* Make fallback host files work correctly

* Added wildcard to host matched. Fixed a bug with wildcard matching in zips

* Add filter switch, hide all switch, add logic for accepting explicitly set filters

* Change filter to type

* Give instructions to call --help instead of showing help on error

* Remove unused using

* Fixes dotnet#380 and dotnet#379

* Respond to review feedback

* Make the message shown for the invalid params match between help and non-help cases

* Set IsPackable=false for new test projects (dotnet/templating#376).

The rationale for this is that creating NuGet packages from tests is probably not the more-common use case and so by default these project should not participate when "dotnet pack" is run at the solution level.

This doesn't prevent users from opting into "dotnet pack", it simply won't be the default.

* Make IsPackable configurable for test project template (dotnet/templating#377).

* Use '-p' as the short form for '--enable-pack' in MSTest v1 project template.

* Implement "--enable-pack" parameter for test project templates (dotnet/templating#377).

This parameter, if set to "true", marks the project as packable (i.e. participates in solution-level calls to "dotnet pack", producing a NuGet package).

* Build for non-Windows platforms

Refactor to use latest cli

Add RestoreSource for dotnet-new3 project

Build with framework version and runtime id

Fix test cases

* Move testbase location to local directory

* Updating the identity of the 2.0 templates

* Better matching across templates with same group identity.

* Added precedence to all template.json files

* Reading & writing template Precedence

* Template matching uses Precedence to help disambiguate templates

* fix for dotnet#395

* Updated package refs in test projects

* fix for exclude, include, & copy only configuration in sources

* Mikes test harness for testing dotnet new commands. Tests for precedence disambiguation

* Fixes per Mike's CR

* renamed the mvc precendence tests

* Add 3PN for nuget.exe

* Allow runtime to be passed in

* Handling reading different cache formats, and upgrading the cache aut… (dotnet#407)

* Handling reading different cache formats, and upgrading the cache automatically as needed

* Cleanup for cache versioning

* Improvements to cache versioning. Language display fix.

* Cache rebuild enhancement. Only scan mount points for templates and langpacks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants