Skip to content
This repository has been archived by the owner on Sep 21, 2018. It is now read-only.

React to project.json schema changes and tooling package renames #536

Merged
merged 3 commits into from
May 4, 2016
Merged

React to project.json schema changes and tooling package renames #536

merged 3 commits into from
May 4, 2016

Conversation

phenning
Copy link
Contributor

@phenning phenning commented May 3, 2016

DamianEdwards
DamianEdwards reviewed May 3, 2016
View reviewed changes
src/BaseTemplates/EmptyWeb/project.json
"wwwroot",
"web.config"
],
"exclude": [ "node_modules" ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "exclude" shouldn't be needed at all. You will however need to include the appsettings.json

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And you need to include "Views" for MVC apps too

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just saw these are separate files, carry on.

@NTaylorMullen
Copy link
Member

Razor tooling bits look good. 👍

@prafullbhosale
Copy link
Contributor

Scaffolding bits look good too!

@phenning phenning merged commit 53b562e into release May 4, 2016
@phenning phenning deleted the phenning/projectJson branch May 5, 2016 20:48
peterblazejewicz added a commit to peterblazejewicz/generator-aspnet that referenced this pull request May 6, 2016
@peterblazejewicz
Rename build options in configuration
6919e66 
See aspnet/Templates#536
@peterblazejewicz peterblazejewicz mentioned this pull request May 6, 2016
Merged
peterblazejewicz added a commit to OmniSharp/generator-aspnet that referenced this pull request May 6, 2016
@peterblazejewicz
Rename build options in configuration (#671)
917740f 
See aspnet/Templates#536
peterblazejewicz added a commit to peterblazejewicz/generator-aspnet that referenced this pull request May 7, 2016
@peterblazejewicz
Revert "Rename build options in configuration (OmniSharp#671)"
b86386d 
This reverts commit 917740f.
The builds are failing under .NET Command Line Tools (1.0.0-rc2-002485)
starting from this commit.
The commit was found using git bisect tool:

917740f is the first bad commit
commit 917740f
Author: Peter Blazejewicz <[email protected]>
Date:   Fri May 6 22:19:05 2016 +0200

    Rename build options in configuration (OmniSharp#671)

    See aspnet/Templates#536

:040000 040000 1dcdfa62565e51d87aafd32b5b279df6b87570b0
db3df7d2f0358c095ab053c4d3be0f8c1749c8db M      templates

Thanks!
peterblazejewicz added a commit to OmniSharp/generator-aspnet that referenced this pull request May 7, 2016
@peterblazejewicz
Revert "Rename build options in configuration (#671)" (#674)
703acd8 
This reverts commit 917740f.
The builds are failing under .NET Command Line Tools (1.0.0-rc2-002485)
starting from this commit.
The commit was found using git bisect tool:

917740f is the first bad commit
commit 917740f
Author: Peter Blazejewicz <[email protected]>
Date:   Fri May 6 22:19:05 2016 +0200

    Rename build options in configuration (#671)

    See aspnet/Templates#536

:040000 040000 1dcdfa62565e51d87aafd32b5b279df6b87570b0
db3df7d2f0358c095ab053c4d3be0f8c1749c8db M      templates

Thanks!
peterblazejewicz added a commit to peterblazejewicz/generator-aspnet that referenced this pull request May 14, 2016
@peterblazejewicz
Rename build options in configuration (OmniSharp#671)
7a8ad80 
See aspnet/Templates#536
peterblazejewicz added a commit to peterblazejewicz/generator-aspnet that referenced this pull request May 14, 2016
@peterblazejewicz
Revert "Rename build options in configuration (OmniSharp#671)" (OmniS…
c40366a 
…harp#674)

This reverts commit 917740f.
The builds are failing under .NET Command Line Tools (1.0.0-rc2-002485)
starting from this commit.
The commit was found using git bisect tool:

917740f is the first bad commit
commit 917740f
Author: Peter Blazejewicz <[email protected]>
Date:   Fri May 6 22:19:05 2016 +0200

    Rename build options in configuration (OmniSharp#671)

    See aspnet/Templates#536

:040000 040000 1dcdfa62565e51d87aafd32b5b279df6b87570b0
db3df7d2f0358c095ab053c4d3be0f8c1749c8db M      templates

Thanks!
peterblazejewicz added a commit to OmniSharp/generator-aspnet that referenced this pull request May 14, 2016
@peterblazejewicz
Rebase/from master (#714)
e0f3285 
* Bring changes from aspnet/Templates#530 (#651)

* Remove comment from Main method in web templates (#645)

See aspnet/Templates/4521a05

* Address feedback for Startup.cs (#646)

See aspnet/Templates@53f174b

* Move Microsoft.NETCore.App to top of dependencies section (#647)

See aspnet/Templates@1a8c062

* Remove unneeded depenedencies from project.json (#648)

See aspnet/Templates@49173ba

* Move server gc section for full framework to app.config (#649)

See aspnet/Templates@289ac238

* 🐛 Remove a comma breaking config (#650)

* Bring changes from aspnet/Templates@37d8e90 (#652)

* ⬆️ Update web template to RC2

This commit brings file content changes
to web template (starter web with individual
authorization (in aspnet/Templates convention)
including:
- namespace changes
- project structure changes
- RC2 related structure additions
- assets changes
- client side deps updates
- test coverage update/rewrite
- client side assets updates
- SQLite EF updates

The template now restores, builds and
runs fine.
There are some small fixes remaining for
this tempalte to be done but they will
be part of separte review PR

* Add missing login partial import in web template (#655)

🐛 missing login partial import

* Fix SQLite connection string (#656)

The RC2 uses new convention for Configuration
access of connection strings. This commit
adopts that convention to construct and later
read SQLite configuration

* 🐛 Fix C#6 interpolation SQLite connection string (#658)

* 🐛 Fix $year$ variable artifact (#657)

* 🎨 Update Semantic UI option for web template to RC2 (#659)

👯

* 🐛 Fix invalid namespace in web template (#661)

Semantic UI version shipped with hardcoded namespace.
This commit fixes this

* Small fixes in Semantic UI version (#662)

- remove unused imports
- whitespace unification between versions

* 🔒 Always use HTTPS for MS url shortener (#663)

/cc @sayedihashimi

* Fix sections in starter web template (#664)

- section ordering

The sections are now sorted the same way as in
aspnet/Templates

* Add missing package declaration (#665)

* Small whitespace fix (#666)

* Fix whitespace to match aspnet/Templates version (#668)

* Add dnxcore50 import to console/lib project.json (#667)

See: aspnet/Templates#542

* Fix content layout of empty web app project.json (#669)

- sections layout
- scripts section content update

Thanks!

* Rename build options in configuration (#671)

See aspnet/Templates#536

* Fix missing package entry (#672)

* Revert "Rename build options in configuration (#671)" (#674)

This reverts commit 917740f.
The builds are failing under .NET Command Line Tools (1.0.0-rc2-002485)
starting from this commit.
The commit was found using git bisect tool:

917740f is the first bad commit
commit 917740f
Author: Peter Blazejewicz <[email protected]>
Date:   Fri May 6 22:19:05 2016 +0200

    Rename build options in configuration (#671)

    See aspnet/Templates#536

:040000 040000 1dcdfa62565e51d87aafd32b5b279df6b87570b0
db3df7d2f0358c095ab053c4d3be0f8c1749c8db M      templates

Thanks!

* Bring changes from aspnet/Templates#530 (#651) (#675)

* Remove comment from Main method in web templates (#645)

See aspnet/Templates/4521a05

* Address feedback for Startup.cs (#646)

See aspnet/Templates@53f174b

* Move Microsoft.NETCore.App to top of dependencies section (#647)

See aspnet/Templates@1a8c062

* Remove unneeded depenedencies from project.json (#648)

See aspnet/Templates@49173ba

* Move server gc section for full framework to app.config (#649)

See aspnet/Templates@289ac238

* 🐛 Remove a comma breaking config (#650)

* 📝 Update CLI animation in README.md. Closes #604 (#676)

- animation change
- framework name update in alt

Thanks!

* 📝 Update README.md. Closes #603 (#670)

- no code samples
- links to docs.asp.net instead of code samples

Thanks!

* Remove UseDefaultHostingConfiguration() from templates (#677)

Bring changes from aspnet/Templates@c749a4f
See also: aspnet/Announcements#174

Thanks!

* Remove duplicate section keys from configs (#678)

Duplicated sections removal
Thanks!

* Update/client side deps for RC2 (#681)

* ⬆️ Bump jQuery version

See aspnet/Templates#549

* ⬆️ Bump jQuery.Validation plugin

See aspnet/Templates#549

* React to project.json schema changes and tooling package renames (#679)

This bring some changes from aspnet/Templates@aa31cb9

Thanks!

* Output name field in Bower config in lowercase. Closes #680 (#682)

The name field meta key should be lower case
otherwise Bower renders a warning to users:
bower invalid-meta The "name" is recommended
to be lowercase, can contain digits, dots, dashes

The changes include:
- actual changes in bower.json templates
- test coverage

Thanks!

* Update/npm dependencies for RC2 (#683)

* ⬆️ Bump Gulp NPM dependency

After this change the version installed is 3.9.1:
npm install
...
├─┬ [email protected]
│ ├── [email protected]
│ ├─┬ [email protected]

Thanks!

* ⬆️ Bump up gulp-concat NPM version

npm install
└── [email protected]

Thanks!

* ⬆️ Bump gulp-uglify NPM version

npm install
...
└─┬ [email protected]

Thanks!

* ⬆️ Bump rimraf NPM version

npm install
...
└─┬ [email protected]
  └── [email protected]

Thanks!

* ⬆️ Bump Grunt NPM version

npm install
...
└─┬ [email protected]
  ├── [email protected]
  ├─┬ [email protected]

Thanks!

* Fix/launch settings (#684)

* 🐛 The launch settings use template variables

This commti fixes problems when launchSettings.json
has not been updated to evaluate project name used
in settings

Thanks!

* Fix missing launch settings

Make sure that changes from aspnet/Templates#521
are incorporated

* 🐛 Remove orphaned <text> tag. Fixes #553 (#687)

See aspnet/Templates#553 and aspnet/Templates#554

Thanks!

* Remove code for EF migration from Startup (#688)

This is follow up to aspnet/Templates#562

Thanks!

* Update Class Library template for RC2. Closes ##689 (#695)

Latest bits run on 1.0.0-rc2-002485

* Update Console application template. Closes #690 (#696)

This updates Console application template to RC2.
Tested on donet 1.0.0-rc2-002485

* Update Empty Web project template for RC2. Closes #691 (#697)

Tested and run using dotnet 1.0.0-preview1-002700

* Move mkdirp to regular dependencies (#699)

The mkdirp is technicaly runtime dependency for client
side installation - not development.
Is used by subgenerator and will be used by project
templates to create empty directories like wwwroot

Thanks!

* Update/web api app. Closes #692 (#700)

* 🎨 Store README.md in project root

The aspnet/Templates creates empty wwwroot web root
directory. This commits brings the same behavior
to generator. The readme is created in project root
while web root folder is created empty

Thanks!

* ⬆️ Update web api template for RC2

Udpated with recent changes from aspnet/Templates.
Tested and run on 1.0.0-preview1-002700

Thanks!

* Update NuGet unstable feeds to point to recent RC2 (#708)

* Update Console application template for RC2. Closes #706 (#709)

Most recent bits for final RC2
Tested with 1.0.0-preview1-002702

* Update Class Library project. Closes #705 (#710)

Update with most recent final RC2 bits
Thanks!

* Update WebAPI application for RC2. Closes #703 (#711)

The final bits of RC2
Tested with 1.0.0-preview1-002702

* Update Empty web application for RC2. Closes #704 (#712)

* Update Empty web application for RC2. Closes #704

Update with final bits for RC2

Tested with 1.0.0-preview1-002702

* 🎨 Store README.md project root

This moves README.md to the project root outside
of template webroot directory:
- implementation
- test coverage

This unifies template with aspnet/Templates structure

Thanks!

* ⬆️ Update web application template to aspnet. Closes #694 [WIP] (#702)

:arrow_up: Update web application template to aspnet. Closes #694

* ⬆️ Update starter web template for RC2. Closes #693 [WIP] (#701)

:arrow_up: Update starter web template for RC2. Closes #693
peterblazejewicz added a commit to peterblazejewicz/generator-aspnet that referenced this pull request May 16, 2016
@peterblazejewicz
Rename build options in configuration (OmniSharp#671)
12f9657 
See aspnet/Templates#536
peterblazejewicz added a commit to peterblazejewicz/generator-aspnet that referenced this pull request May 16, 2016
@peterblazejewicz
Revert "Rename build options in configuration (OmniSharp#671)" (OmniS…
53206f1 
…harp#674)

This reverts commit 917740f.
The builds are failing under .NET Command Line Tools (1.0.0-rc2-002485)
starting from this commit.
The commit was found using git bisect tool:

917740f is the first bad commit
commit 917740f
Author: Peter Blazejewicz <[email protected]>
Date:   Fri May 6 22:19:05 2016 +0200

    Rename build options in configuration (OmniSharp#671)

    See aspnet/Templates#536

:040000 040000 1dcdfa62565e51d87aafd32b5b279df6b87570b0
db3df7d2f0358c095ab053c4d3be0f8c1749c8db M      templates

Thanks!
peterblazejewicz added a commit to OmniSharp/generator-aspnet that referenced this pull request May 16, 2016
@peterblazejewicz
Rebase/master (#721)
2730846 
* Bring changes from aspnet/Templates#530 (#651)

* Remove comment from Main method in web templates (#645)

See aspnet/Templates/4521a05

* Address feedback for Startup.cs (#646)

See aspnet/Templates@53f174b

* Move Microsoft.NETCore.App to top of dependencies section (#647)

See aspnet/Templates@1a8c062

* Remove unneeded depenedencies from project.json (#648)

See aspnet/Templates@49173ba

* Move server gc section for full framework to app.config (#649)

See aspnet/Templates@289ac238

* 🐛 Remove a comma breaking config (#650)

* Fixed small formatting issue in RC2 info (#717)

Thanks to @horsdal!

* Bring changes from aspnet/Templates@37d8e90 (#652)

* ⬆️ Update web template to RC2

This commit brings file content changes
to web template (starter web with individual
authorization (in aspnet/Templates convention)
including:
- namespace changes
- project structure changes
- RC2 related structure additions
- assets changes
- client side deps updates
- test coverage update/rewrite
- client side assets updates
- SQLite EF updates

The template now restores, builds and
runs fine.
There are some small fixes remaining for
this tempalte to be done but they will
be part of separte review PR

* Add missing login partial import in web template (#655)

🐛 missing login partial import

* Fix SQLite connection string (#656)

The RC2 uses new convention for Configuration
access of connection strings. This commit
adopts that convention to construct and later
read SQLite configuration

* 🐛 Fix C#6 interpolation SQLite connection string (#658)

* 🐛 Fix $year$ variable artifact (#657)

* 🎨 Update Semantic UI option for web template to RC2 (#659)

👯

* 🐛 Fix invalid namespace in web template (#661)

Semantic UI version shipped with hardcoded namespace.
This commit fixes this

* Small fixes in Semantic UI version (#662)

- remove unused imports
- whitespace unification between versions

* 🔒 Always use HTTPS for MS url shortener (#663)

/cc @sayedihashimi

* Fix sections in starter web template (#664)

- section ordering

The sections are now sorted the same way as in
aspnet/Templates

* Add missing package declaration (#665)

* Small whitespace fix (#666)

* Fix whitespace to match aspnet/Templates version (#668)

* Add dnxcore50 import to console/lib project.json (#667)

See: aspnet/Templates#542

* Fix content layout of empty web app project.json (#669)

- sections layout
- scripts section content update

Thanks!

* Rename build options in configuration (#671)

See aspnet/Templates#536

* Fix missing package entry (#672)

* Revert "Rename build options in configuration (#671)" (#674)

This reverts commit 917740f.
The builds are failing under .NET Command Line Tools (1.0.0-rc2-002485)
starting from this commit.
The commit was found using git bisect tool:

917740f is the first bad commit
commit 917740f
Author: Peter Blazejewicz <[email protected]>
Date:   Fri May 6 22:19:05 2016 +0200

    Rename build options in configuration (#671)

    See aspnet/Templates#536

:040000 040000 1dcdfa62565e51d87aafd32b5b279df6b87570b0
db3df7d2f0358c095ab053c4d3be0f8c1749c8db M      templates

Thanks!

* Bring changes from aspnet/Templates#530 (#651) (#675)

* Remove comment from Main method in web templates (#645)

See aspnet/Templates/4521a05

* Address feedback for Startup.cs (#646)

See aspnet/Templates@53f174b

* Move Microsoft.NETCore.App to top of dependencies section (#647)

See aspnet/Templates@1a8c062

* Remove unneeded depenedencies from project.json (#648)

See aspnet/Templates@49173ba

* Move server gc section for full framework to app.config (#649)

See aspnet/Templates@289ac238

* 🐛 Remove a comma breaking config (#650)

* 📝 Update CLI animation in README.md. Closes #604 (#676)

- animation change
- framework name update in alt

Thanks!

* 📝 Update README.md. Closes #603 (#670)

- no code samples
- links to docs.asp.net instead of code samples

Thanks!

* Remove UseDefaultHostingConfiguration() from templates (#677)

Bring changes from aspnet/Templates@c749a4f
See also: aspnet/Announcements#174

Thanks!

* Remove duplicate section keys from configs (#678)

Duplicated sections removal
Thanks!

* Update/client side deps for RC2 (#681)

* ⬆️ Bump jQuery version

See aspnet/Templates#549

* ⬆️ Bump jQuery.Validation plugin

See aspnet/Templates#549

* React to project.json schema changes and tooling package renames (#679)

This bring some changes from aspnet/Templates@aa31cb9

Thanks!

* Output name field in Bower config in lowercase. Closes #680 (#682)

The name field meta key should be lower case
otherwise Bower renders a warning to users:
bower invalid-meta The "name" is recommended
to be lowercase, can contain digits, dots, dashes

The changes include:
- actual changes in bower.json templates
- test coverage

Thanks!

* Update/npm dependencies for RC2 (#683)

* ⬆️ Bump Gulp NPM dependency

After this change the version installed is 3.9.1:
npm install
...
├─┬ [email protected]
│ ├── [email protected]
│ ├─┬ [email protected]

Thanks!

* ⬆️ Bump up gulp-concat NPM version

npm install
└── [email protected]

Thanks!

* ⬆️ Bump gulp-uglify NPM version

npm install
...
└─┬ [email protected]

Thanks!

* ⬆️ Bump rimraf NPM version

npm install
...
└─┬ [email protected]
  └── [email protected]

Thanks!

* ⬆️ Bump Grunt NPM version

npm install
...
└─┬ [email protected]
  ├── [email protected]
  ├─┬ [email protected]

Thanks!

* Fix/launch settings (#684)

* 🐛 The launch settings use template variables

This commti fixes problems when launchSettings.json
has not been updated to evaluate project name used
in settings

Thanks!

* Fix missing launch settings

Make sure that changes from aspnet/Templates#521
are incorporated

* 🐛 Remove orphaned <text> tag. Fixes #553 (#687)

See aspnet/Templates#553 and aspnet/Templates#554

Thanks!

* Remove code for EF migration from Startup (#688)

This is follow up to aspnet/Templates#562

Thanks!

* Update Class Library template for RC2. Closes ##689 (#695)

Latest bits run on 1.0.0-rc2-002485

* Update Console application template. Closes #690 (#696)

This updates Console application template to RC2.
Tested on donet 1.0.0-rc2-002485

* Update Empty Web project template for RC2. Closes #691 (#697)

Tested and run using dotnet 1.0.0-preview1-002700

* Move mkdirp to regular dependencies (#699)

The mkdirp is technicaly runtime dependency for client
side installation - not development.
Is used by subgenerator and will be used by project
templates to create empty directories like wwwroot

Thanks!

* Update/web api app. Closes #692 (#700)

* 🎨 Store README.md in project root

The aspnet/Templates creates empty wwwroot web root
directory. This commits brings the same behavior
to generator. The readme is created in project root
while web root folder is created empty

Thanks!

* ⬆️ Update web api template for RC2

Udpated with recent changes from aspnet/Templates.
Tested and run on 1.0.0-preview1-002700

Thanks!

* Update NuGet unstable feeds to point to recent RC2 (#708)

* Update Console application template for RC2. Closes #706 (#709)

Most recent bits for final RC2
Tested with 1.0.0-preview1-002702

* Update Class Library project. Closes #705 (#710)

Update with most recent final RC2 bits
Thanks!

* Update WebAPI application for RC2. Closes #703 (#711)

The final bits of RC2
Tested with 1.0.0-preview1-002702

* Update Empty web application for RC2. Closes #704 (#712)

* Update Empty web application for RC2. Closes #704

Update with final bits for RC2

Tested with 1.0.0-preview1-002702

* 🎨 Store README.md project root

This moves README.md to the project root outside
of template webroot directory:
- implementation
- test coverage

This unifies template with aspnet/Templates structure

Thanks!

* ⬆️ Update web application template to aspnet. Closes #694 [WIP] (#702)

:arrow_up: Update web application template to aspnet. Closes #694

* ⬆️ Update starter web template for RC2. Closes #693 [WIP] (#701)

:arrow_up: Update starter web template for RC2. Closes #693

* [WIP] Update Unit test project for RC2. Closes #639 (#716)

Update Unit test project for RC2. Closes #639

* Call NPM and Bower install scripts in postrestore (#718)

See #713 comments about RC2 changes and avoiding
less experienced users confusion

Thanks!

* Add EF migration usage hints for RC2 web template (#719)

EF migrations are now not built-into templates
let users to know how to scaffold database using code-first scenario
with saved migrations
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@phenning @NTaylorMullen @prafullbhosale @DamianEdwards @rustd @madskristensen @dnfclas