Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit 74cac77

Browse files
Normalise trailing whitespace and line endings everywhere
1 parent c425137 commit 74cac77

File tree

174 files changed

+782
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+782
-783
lines changed

.gitattributes

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*.png binary
1414
*.gif binary
1515

16-
*.cs text=auto diff=csharp
16+
*.cs text=auto diff=csharp
1717
*.vb text=auto
1818
*.resx text=auto
1919
*.c text=auto
@@ -48,4 +48,4 @@
4848
*.fsproj text=auto
4949
*.dbproj text=auto
5050
*.sln text=auto eol=crlf
51-
*.sh eol=lf
51+
*.sh eol=lf

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ os:
1717
- osx
1818
osx_image: xcode7.1
1919
script:
20-
- ./build.sh verify
20+
- ./build.sh verify

NuGet.master.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
<add key="AspNetVNext" value="https://www.myget.org/f/aspnetmaster/api/v3/index.json" />
66
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
77
</packageSources>
8-
</configuration>
8+
</configuration>

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Note that to run the React example, you'll also need to run `webpack` from the `
9191
```
9292

9393
4. Where applicable, build the project. For example, the Angular example uses Gulp, so you'll need to execute `gulp`, whereas the React example uses Webpack, so you'll need to execute `webpack`. The ES2015 example does not need to be built.
94-
94+
9595
If you don't already have it, install the applicable build tool first (e.g., `npm install -g webpack`).
9696

9797
5. Run the project (and wait until it displays the message `Application started`)

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ build_script:
44
- build.cmd verify
55
clone_depth: 1
66
test: off
7-
deploy: off
7+
deploy: off

samples/angular/MusicStore/Apis/ArtistsApiController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ public async Task<ActionResult> Lookup()
2727
return Json(artists);
2828
}
2929
}
30-
}
30+
}

samples/angular/MusicStore/Apis/GenresApiController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ public async Task<ActionResult> GenreAlbums(int genreId)
6767
return Json(albums);
6868
}
6969
}
70-
}
70+
}

samples/angular/MusicStore/Apis/Models/AccountViewModels.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ public class RegisterViewModel
6060
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
6161
public string ConfirmPassword { get; set; }
6262
}
63-
}
63+
}

samples/angular/MusicStore/Apis/Models/Album.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class Album
77
{
88
public Album()
99
{
10-
// TODO: Temporary hack to populate the orderdetails until EF does this automatically.
10+
// TODO: Temporary hack to populate the orderdetails until EF does this automatically.
1111
OrderDetails = new List<OrderDetail>();
1212
}
1313

@@ -37,4 +37,4 @@ public Album()
3737

3838
public virtual ICollection<OrderDetail> OrderDetails { get; set; }
3939
}
40-
}
40+
}

samples/angular/MusicStore/Apis/Models/Artist.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ public class Artist
99
[Required]
1010
public string Name { get; set; }
1111
}
12-
}
12+
}

samples/angular/MusicStore/Apis/Models/CartItem.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ public class CartItem
1818

1919
public virtual Album Album { get; set; }
2020
}
21-
}
21+
}

samples/angular/MusicStore/Apis/Models/Genre.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ public Genre()
2121
[JsonIgnore]
2222
public virtual ICollection<Album> Albums { get; set; }
2323
}
24-
}
24+
}

samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ protected override void OnModelCreating(ModelBuilder builder)
3131
base.OnModelCreating(builder);
3232
}
3333
}
34-
}
34+
}

samples/angular/MusicStore/Apis/Models/Order.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,4 @@ public Order()
7070

7171
public ICollection<OrderDetail> OrderDetails { get; set; }
7272
}
73-
}
73+
}

samples/angular/MusicStore/Apis/Models/OrderDetail.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ public class OrderDetail
1111
public virtual Album Album { get; set; }
1212
public virtual Order Order { get; set; }
1313
}
14-
}
14+
}

samples/angular/MusicStore/Apis/Models/SampleData.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ private static async Task AddOrUpdateAsync<TEntity>(
4242
{
4343
// Query in a separate context so that we can attach existing entities as modified
4444
List<TEntity> existingData;
45-
45+
4646
using (var scope = serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
4747
using (var db = scope.ServiceProvider.GetService<MusicStoreContext>())
4848
{
4949
existingData = db.Set<TEntity>().ToList();
5050
}
51-
51+
5252
using (var scope = serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
5353
using (var db = scope.ServiceProvider.GetService<MusicStoreContext>())
5454
{
@@ -65,8 +65,8 @@ private static async Task AddOrUpdateAsync<TEntity>(
6565

6666
private static Album[] GetAlbums(string imgUrl, Dictionary<string, Genre> genres, Dictionary<string, Artist> artists)
6767
{
68-
var albums = new Album[]
69-
{
68+
var albums = new Album[]
69+
{
7070
new Album { Title = "The Best Of The Men At Work", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Men At Work"], AlbumArtUrl = imgUrl },
7171
new Album { Title = "...And Justice For All", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl },
7272
new Album { Title = "עד גבול האור", Genre = genres["World"], Price = 8.99M, Artist = artists["אריק אינשטיין"], AlbumArtUrl = imgUrl },
@@ -912,4 +912,4 @@ public static Dictionary<string, Genre> Genres
912912
}
913913
}
914914
}
915-
}
915+
}

samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ namespace MusicStore.Models
88
public static class SentimentAnalysis
99
{
1010
private static string[] positiveSentimentWords = new[] { "happy", "fun", "joy", "love", "delight", "bunny", "bunnies", "asp.net" };
11-
11+
1212
private static string[] negativeSentimentWords = new[] { "sad", "pain", "despair", "hate", "scorn", "death", "package management" };
13-
13+
1414
public static SentimentResult GetSentiment(string text) {
1515
var numPositiveWords = CountWordOccurrences(text, positiveSentimentWords);
1616
var numNegativeWords = CountWordOccurrences(text, negativeSentimentWords);
@@ -35,4 +35,4 @@ public enum SentimentResult {
3535
Positive,
3636
}
3737
}
38-
}
38+
}

samples/angular/MusicStore/Apis/Models/ShoppingCart.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public int GetCount()
123123

124124
public decimal GetTotal()
125125
{
126-
// Multiply album price by count of that album to get
126+
// Multiply album price by count of that album to get
127127
// the current price for each of those albums in the cart
128128
// sum all album price totals to get the cart total
129129

@@ -190,7 +190,7 @@ public string GetCartId(HttpContext context)
190190

191191
if (string.IsNullOrWhiteSpace(sessionCookie))
192192
{
193-
//A GUID to hold the cartId.
193+
//A GUID to hold the cartId.
194194
cartId = Guid.NewGuid().ToString();
195195

196196
// Send cart Id as a cookie to the client.
@@ -204,4 +204,4 @@ public string GetCartId(HttpContext context)
204204
return cartId;
205205
}
206206
}
207-
}
207+
}

samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ public override void OnResultExecuting(ResultExecutingContext context)
1616
base.OnResultExecuting(context);
1717
}
1818
}
19-
}
19+
}

samples/angular/MusicStore/Infrastructure/PagedList.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,4 +147,4 @@ public PagingConfig(int page, int pageSize)
147147
public int PageSize { get; set; }
148148
}
149149
}
150-
}
150+
}

samples/angular/MusicStore/MusicStore.xproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
<DevelopmentServerPort>5068</DevelopmentServerPort>
1717
</PropertyGroup>
1818
<Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
19-
</Project>
19+
</Project>

samples/angular/MusicStore/Startup.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void ConfigureServices(IServiceCollection services)
4444
// Uncomment the following line to add Web API services which makes it easier to port Web API 2 controllers.
4545
// You will also need to add the Microsoft.AspNet.Mvc.WebApiCompatShim package to the 'dependencies' section of project.json.
4646
// services.AddWebApiConventions();
47-
47+
4848
// Add EF services to the service container
4949
services.AddEntityFramework()
5050
.AddSqlite()
@@ -82,7 +82,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
8282
{
8383
// Initialize the sample data
8484
SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
85-
85+
8686
loggerFactory.MinimumLevel = LogLevel.Warning;
8787
loggerFactory.AddConsole();
8888
loggerFactory.AddDebug();
@@ -103,7 +103,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
103103
// send the request to the following path or controller action.
104104
app.UseExceptionHandler("/Home/Error");
105105
}
106-
106+
107107
// Add static files to the request pipeline.
108108
app.UseStaticFiles();
109109

@@ -112,7 +112,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
112112
{
113113
// Matches requests that correspond to an existent controller/action pair
114114
routes.MapRoute("default", "{controller}/{action}/{id:int?}");
115-
115+
116116
// Matches any other request that doesn't appear to have a filename extension (defined as 'having a dot in the last URI segment').
117117
// This means you'll correctly get 404s for /some/dir/non-existent-image.png instead of returning the SPA HTML.
118118
// However, it means requests like /customers/isaac.newton will *not* be mapped into the SPA, so if you need to accept
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
@{
2-
ViewData["Title"] = "Home Page";
3-
}
4-
5-
<cache vary-by="@Context.Request.Path">
6-
<app asp-ng2-prerender-module="wwwroot/ng-app/components/app/app">
7-
Loading...
8-
</app>
9-
</cache>
10-
11-
@section scripts {
12-
@await Html.PrimeCache(Url.Action("GenreMenuList", "GenresApi"))
13-
@await Html.PrimeCache(Url.Action("MostPopular", "AlbumsApi"))
14-
15-
<script src="~/lib/angular2/bundles/angular2-polyfills.js"></script>
16-
<script src="~/lib/traceur/bin/traceur-runtime.js"></script>
17-
<script src="~/lib/es6-module-loader/dist/es6-module-loader-sans-promises.js"></script>
18-
<script src="~/lib/systemjs/dist/system.src.js"></script>
19-
<script src="~/system.config.js"></script>
20-
<script src="~/lib/rxjs/bundles/Rx.js"></script>
21-
<script src="~/lib/angular2/bundles/angular2.dev.js"></script>
22-
<script src="~/lib/angular2/bundles/router.dev.js"></script>
23-
<script src="~/lib/angular2/bundles/http.dev.js"></script>
24-
<script src="~/lib/angular2-aspnet/bundles/angular2-aspnet.js"></script>
25-
<script>System.import('./ng-app/components/app/bootstrap');</script>
26-
}
1+
@{
2+
ViewData["Title"] = "Home Page";
3+
}
4+
5+
<cache vary-by="@Context.Request.Path">
6+
<app asp-ng2-prerender-module="wwwroot/ng-app/components/app/app">
7+
Loading...
8+
</app>
9+
</cache>
10+
11+
@section scripts {
12+
@await Html.PrimeCache(Url.Action("GenreMenuList", "GenresApi"))
13+
@await Html.PrimeCache(Url.Action("MostPopular", "AlbumsApi"))
14+
15+
<script src="~/lib/angular2/bundles/angular2-polyfills.js"></script>
16+
<script src="~/lib/traceur/bin/traceur-runtime.js"></script>
17+
<script src="~/lib/es6-module-loader/dist/es6-module-loader-sans-promises.js"></script>
18+
<script src="~/lib/systemjs/dist/system.src.js"></script>
19+
<script src="~/system.config.js"></script>
20+
<script src="~/lib/rxjs/bundles/Rx.js"></script>
21+
<script src="~/lib/angular2/bundles/angular2.dev.js"></script>
22+
<script src="~/lib/angular2/bundles/router.dev.js"></script>
23+
<script src="~/lib/angular2/bundles/http.dev.js"></script>
24+
<script src="~/lib/angular2-aspnet/bundles/angular2-aspnet.js"></script>
25+
<script>System.import('./ng-app/components/app/bootstrap');</script>
26+
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@{
2-
ViewData["Title"] = "Error";
3-
}
4-
5-
<h1 class="text-danger">Error.</h1>
6-
<h2 class="text-danger">An error occurred while processing your request.</h2>
1+
@{
2+
ViewData["Title"] = "Error";
3+
}
4+
5+
<h1 class="text-danger">Error.</h1>
6+
<h2 class="text-danger">An error occurred while processing your request.</h2>

0 commit comments

Comments
 (0)