Skip to content
This repository has been archived by the owner on Feb 13, 2019. It is now read-only.

Rebase/master #721

Merged
merged 49 commits into from
May 16, 2016
Merged

Conversation

peterblazejewicz
Copy link
Member

Make branch even and able to automatically merge via replying master over RC2 branch and fixing conflicts
Thanks!

peterblazejewicz and others added 30 commits April 27, 2016 22:00
Update master branch README.md from RC2
* Remove comment from Main method in web templates (OmniSharp#645)

See aspnet/Templates/4521a05

* Address feedback for Startup.cs (OmniSharp#646)

See aspnet/Templates@53f174b

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

See aspnet/Templates@1a8c062

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

See aspnet/Templates@49173ba

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

See aspnet/Templates@289ac238

* 🐛 Remove a comma breaking config (OmniSharp#650)
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
The RC2 uses new convention for Configuration
access of connection strings. This commit
adopts that convention to construct and later
read SQLite configuration
Semantic UI version shipped with hardcoded namespace.
This commit fixes this
- remove unused imports
- whitespace unification between versions
- section ordering

The sections are now sorted the same way as in
aspnet/Templates
- sections layout
- scripts section content update

Thanks!
…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!
* Remove comment from Main method in web templates (OmniSharp#645)

See aspnet/Templates/4521a05

* Address feedback for Startup.cs (OmniSharp#646)

See aspnet/Templates@53f174b

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

See aspnet/Templates@1a8c062

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

See aspnet/Templates@49173ba

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

See aspnet/Templates@289ac238

* 🐛 Remove a comma breaking config (OmniSharp#650)
)

- animation change
- framework name update in alt

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

Thanks!
* ⬆️ Bump jQuery version

See aspnet/Templates#549

* ⬆️ Bump jQuery.Validation plugin

See aspnet/Templates#549
…mniSharp#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!
* ⬆️ 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!
* 🐛 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
)

This updates Console application template to RC2.
Tested on donet 1.0.0-rc2-002485
…Sharp#697)

Tested and run using dotnet 1.0.0-preview1-002700
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!
* 🎨 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!
…niSharp#709)

Most recent bits for final RC2
Tested with 1.0.0-preview1-002702
Update with most recent final RC2 bits
Thanks!
The final bits of RC2
Tested with 1.0.0-preview1-002702
…#712)

* Update Empty web application for RC2. Closes OmniSharp#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!
…IP] (OmniSharp#702)

⬆️ Update web application template to aspnet. Closes OmniSharp#694
See OmniSharp#713 comments about RC2 changes and avoiding
less experienced users confusion

Thanks!
EF migrations are now not built-into templates
let users to know how to scaffold database using code-first scenario
with saved migrations
@peterblazejewicz peterblazejewicz merged commit 2730846 into OmniSharp:rc2 May 16, 2016
@peterblazejewicz peterblazejewicz deleted the rebase/master branch May 16, 2016 20:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants