Normalise trailing whitespace and line endings everywhere

aspnet · 74cac774f8800f59da9aaf98950b7da9e2297d72 · SteveSandersonMS committed Mar 1, 2016 · Mar 1, 2016 · 74cac77
1 parent c425137
commit 74cac774f8800f59da9aaf98950b7da9e2297d72
diff --git a/.gitattributes b/.gitattributes
@@ -13,7 +13,7 @@
 *.png 	binary
 *.gif 	binary
 
-*.cs text=auto diff=csharp 
+*.cs text=auto diff=csharp
 *.vb text=auto
 *.resx text=auto
 *.c text=auto
@@ -48,4 +48,4 @@
 *.fsproj text=auto
 *.dbproj text=auto
 *.sln text=auto eol=crlf
-*.sh eol=lf
+*.sh eol=lf
diff --git a/.travis.yml b/.travis.yml
@@ -17,4 +17,4 @@ os:
   - osx
 osx_image: xcode7.1
 script:
-  - ./build.sh verify
+  - ./build.sh verify
diff --git a/NuGet.master.config b/NuGet.master.config
@@ -5,4 +5,4 @@
     <add key="AspNetVNext" value="https://www.myget.org/f/aspnetmaster/api/v3/index.json" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
-</configuration>
+</configuration>
diff --git a/README.md b/README.md
@@ -91,7 +91,7 @@ Note that to run the React example, you'll also need to run `webpack` from the `
    ```
 
 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.
- 
+
    If you don't already have it, install the applicable build tool first (e.g., `npm install -g webpack`).
 
 5. Run the project (and wait until it displays the message `Application started`)
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,4 +4,4 @@ build_script:
   - build.cmd verify
 clone_depth: 1
 test: off
-deploy: off
+deploy: off
diff --git a/samples/angular/MusicStore/Apis/ArtistsApiController.cs b/samples/angular/MusicStore/Apis/ArtistsApiController.cs
@@ -27,4 +27,4 @@ public ArtistsApiController(MusicStoreContext storeContext)
             return Json(artists);
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/GenresApiController.cs b/samples/angular/MusicStore/Apis/GenresApiController.cs
@@ -67,4 +67,4 @@ public GenresApiController(MusicStoreContext storeContext)
             return Json(albums);
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/AccountViewModels.cs b/samples/angular/MusicStore/Apis/Models/AccountViewModels.cs
@@ -60,4 +60,4 @@ public class RegisterViewModel
         [Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
         public string ConfirmPassword { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/Album.cs b/samples/angular/MusicStore/Apis/Models/Album.cs
@@ -7,7 +7,7 @@ public class Album
     {
         public Album()
         {
-            // TODO: Temporary hack to populate the orderdetails until EF does this automatically. 
+            // TODO: Temporary hack to populate the orderdetails until EF does this automatically.
             OrderDetails = new List<OrderDetail>();
         }
 
@@ -37,4 +37,4 @@ public Album()
 
         public virtual ICollection<OrderDetail> OrderDetails { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/Artist.cs b/samples/angular/MusicStore/Apis/Models/Artist.cs
@@ -9,4 +9,4 @@ public class Artist
         [Required]
         public string Name { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/CartItem.cs b/samples/angular/MusicStore/Apis/Models/CartItem.cs
@@ -18,4 +18,4 @@ public class CartItem
 
         public virtual Album Album { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/Genre.cs b/samples/angular/MusicStore/Apis/Models/Genre.cs
@@ -21,4 +21,4 @@ public Genre()
         [JsonIgnore]
         public virtual ICollection<Album> Albums { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs b/samples/angular/MusicStore/Apis/Models/MusicStoreContext.cs
@@ -31,4 +31,4 @@ protected override void OnModelCreating(ModelBuilder builder)
             base.OnModelCreating(builder);
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/Order.cs b/samples/angular/MusicStore/Apis/Models/Order.cs
@@ -70,4 +70,4 @@ public Order()
 
         public ICollection<OrderDetail> OrderDetails { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/OrderDetail.cs b/samples/angular/MusicStore/Apis/Models/OrderDetail.cs
@@ -11,4 +11,4 @@ public class OrderDetail
         public virtual Album Album { get; set; }
         public virtual Order Order { get; set; }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/SampleData.cs b/samples/angular/MusicStore/Apis/Models/SampleData.cs
@@ -42,13 +42,13 @@ public static class SampleData
         {
             // Query in a separate context so that we can attach existing entities as modified
             List<TEntity> existingData;
-            
+
             using (var scope = serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
             using (var db = scope.ServiceProvider.GetService<MusicStoreContext>())
             {
                 existingData = db.Set<TEntity>().ToList();
             }
-            
+
             using (var scope = serviceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
             using (var db = scope.ServiceProvider.GetService<MusicStoreContext>())
             {
@@ -65,8 +65,8 @@ public static class SampleData
 
         private static Album[] GetAlbums(string imgUrl, Dictionary<string, Genre> genres, Dictionary<string, Artist> artists)
         {
-            var albums = new Album[] 
-            { 
+            var albums = new Album[]
+            {
                 new Album { Title = "The Best Of The Men At Work", Genre = genres["Pop"], Price = 8.99M, Artist = artists["Men At Work"], AlbumArtUrl = imgUrl },
                 new Album { Title = "...And Justice For All", Genre = genres["Metal"], Price = 8.99M, Artist = artists["Metallica"], AlbumArtUrl = imgUrl },
                 new Album { Title = "עד גבול האור", Genre = genres["World"], Price = 8.99M, Artist = artists["אריק אינשטיין"], AlbumArtUrl = imgUrl },
@@ -912,4 +912,4 @@ private static Album[] GetAlbums(string imgUrl, Dictionary<string, Genre> genres
             }
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs b/samples/angular/MusicStore/Apis/Models/SentimentAnalysis.cs
@@ -8,9 +8,9 @@ namespace MusicStore.Models
     public static class SentimentAnalysis
     {
         private static string[] positiveSentimentWords = new[] { "happy", "fun", "joy", "love", "delight", "bunny", "bunnies", "asp.net" };
-        
+
         private static string[] negativeSentimentWords = new[] { "sad", "pain", "despair", "hate", "scorn", "death", "package management" };
-        
+
         public static SentimentResult GetSentiment(string text) {
             var numPositiveWords = CountWordOccurrences(text, positiveSentimentWords);
             var numNegativeWords = CountWordOccurrences(text, negativeSentimentWords);
@@ -35,4 +35,4 @@ public enum SentimentResult {
             Positive,
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Apis/Models/ShoppingCart.cs b/samples/angular/MusicStore/Apis/Models/ShoppingCart.cs
@@ -123,7 +123,7 @@ public int GetCount()
 
         public decimal GetTotal()
         {
-            // Multiply album price by count of that album to get 
+            // Multiply album price by count of that album to get
             // the current price for each of those albums in the cart
             // sum all album price totals to get the cart total
 
@@ -190,7 +190,7 @@ public string GetCartId(HttpContext context)
 
             if (string.IsNullOrWhiteSpace(sessionCookie))
             {
-                //A GUID to hold the cartId. 
+                //A GUID to hold the cartId.
                 cartId = Guid.NewGuid().ToString();
 
                 // Send cart Id as a cookie to the client.
@@ -204,4 +204,4 @@ public string GetCartId(HttpContext context)
             return cartId;
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs b/samples/angular/MusicStore/Infrastructure/NoCacheAttribute.cs
@@ -16,4 +16,4 @@ public override void OnResultExecuting(ResultExecutingContext context)
             base.OnResultExecuting(context);
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/Infrastructure/PagedList.cs b/samples/angular/MusicStore/Infrastructure/PagedList.cs
@@ -147,4 +147,4 @@ public PagingConfig(int page, int pageSize)
             public int PageSize { get; set; }
         }
     }
-}
+}
diff --git a/samples/angular/MusicStore/MusicStore.xproj b/samples/angular/MusicStore/MusicStore.xproj
@@ -16,4 +16,4 @@
     <DevelopmentServerPort>5068</DevelopmentServerPort>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
+</Project>
diff --git a/samples/angular/MusicStore/Startup.cs b/samples/angular/MusicStore/Startup.cs
@@ -44,7 +44,7 @@ public void ConfigureServices(IServiceCollection services)
             // Uncomment the following line to add Web API services which makes it easier to port Web API 2 controllers.
             // You will also need to add the Microsoft.AspNet.Mvc.WebApiCompatShim package to the 'dependencies' section of project.json.
             // services.AddWebApiConventions();
-            
+
             // Add EF services to the service container
             services.AddEntityFramework()
                 .AddSqlite()
@@ -82,7 +82,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
         {
             // Initialize the sample data
             SampleData.InitializeMusicStoreDatabaseAsync(app.ApplicationServices).Wait();
-            
+
             loggerFactory.MinimumLevel = LogLevel.Warning;
             loggerFactory.AddConsole();
             loggerFactory.AddDebug();
@@ -103,7 +103,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 // send the request to the following path or controller action.
                 app.UseExceptionHandler("/Home/Error");
             }
-            
+
             // Add static files to the request pipeline.
             app.UseStaticFiles();
 
@@ -112,7 +112,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
             {
                 // Matches requests that correspond to an existent controller/action pair
                 routes.MapRoute("default", "{controller}/{action}/{id:int?}");
-                
+
                 // Matches any other request that doesn't appear to have a filename extension (defined as 'having a dot in the last URI segment').
                 // This means you'll correctly get 404s for /some/dir/non-existent-image.png instead of returning the SPA HTML.
                 // However, it means requests like /customers/isaac.newton will *not* be mapped into the SPA, so if you need to accept
diff --git a/samples/angular/MusicStore/Views/Home/Index.cshtml b/samples/angular/MusicStore/Views/Home/Index.cshtml
@@ -1,26 +1,26 @@
-@{
-    ViewData["Title"] = "Home Page";
-}
-
-<cache vary-by="@Context.Request.Path">
-    <app asp-ng2-prerender-module="wwwroot/ng-app/components/app/app">
-        Loading...
-    </app>
-</cache>
-
-@section scripts {
-    @await Html.PrimeCache(Url.Action("GenreMenuList", "GenresApi"))
-    @await Html.PrimeCache(Url.Action("MostPopular", "AlbumsApi"))
-
-    <script src="~/lib/angular2/bundles/angular2-polyfills.js"></script>
-    <script src="~/lib/traceur/bin/traceur-runtime.js"></script>
-    <script src="~/lib/es6-module-loader/dist/es6-module-loader-sans-promises.js"></script>
-    <script src="~/lib/systemjs/dist/system.src.js"></script>
-    <script src="~/system.config.js"></script>
-    <script src="~/lib/rxjs/bundles/Rx.js"></script>
-    <script src="~/lib/angular2/bundles/angular2.dev.js"></script>
-    <script src="~/lib/angular2/bundles/router.dev.js"></script>
-    <script src="~/lib/angular2/bundles/http.dev.js"></script>
-    <script src="~/lib/angular2-aspnet/bundles/angular2-aspnet.js"></script>
-    <script>System.import('./ng-app/components/app/bootstrap');</script>
-}
+@{
+    ViewData["Title"] = "Home Page";
+}
+
+<cache vary-by="@Context.Request.Path">
+    <app asp-ng2-prerender-module="wwwroot/ng-app/components/app/app">
+        Loading...
+    </app>
+</cache>
+
+@section scripts {
+    @await Html.PrimeCache(Url.Action("GenreMenuList", "GenresApi"))
+    @await Html.PrimeCache(Url.Action("MostPopular", "AlbumsApi"))
+
+    <script src="~/lib/angular2/bundles/angular2-polyfills.js"></script>
+    <script src="~/lib/traceur/bin/traceur-runtime.js"></script>
+    <script src="~/lib/es6-module-loader/dist/es6-module-loader-sans-promises.js"></script>
+    <script src="~/lib/systemjs/dist/system.src.js"></script>
+    <script src="~/system.config.js"></script>
+    <script src="~/lib/rxjs/bundles/Rx.js"></script>
+    <script src="~/lib/angular2/bundles/angular2.dev.js"></script>
+    <script src="~/lib/angular2/bundles/router.dev.js"></script>
+    <script src="~/lib/angular2/bundles/http.dev.js"></script>
+    <script src="~/lib/angular2-aspnet/bundles/angular2-aspnet.js"></script>
+    <script>System.import('./ng-app/components/app/bootstrap');</script>
+}
diff --git a/samples/angular/MusicStore/Views/Shared/Error.cshtml b/samples/angular/MusicStore/Views/Shared/Error.cshtml
@@ -1,6 +1,6 @@
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
+@{
+    ViewData["Title"] = "Error";
+}
+
+<h1 class="text-danger">Error.</h1>
+<h2 class="text-danger">An error occurred while processing your request.</h2>